m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The gradients (Cycling or not) are now per-picture, so: The main and spare page have separate gradients; Loading a picture resets the gradients and loads the new image's (if any); Undo and Redo correctly navigate to the right gradients when you Undo/Redo Loading different color-cycling images.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1600 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2010-08-31 23:48:10 +00:00
parent 838dd63a0c
commit 962d23dbc4
7 changed files with 118 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/loadsave.c
View File

@@ -719,13 +719,13 @@ void Load_image(T_IO_Context *context)
// Color cyling ranges:
for (i=0; i<16; i++)
Gradient_array[i].Speed=0;
Main_backups->Pages->Gradients->Range[i].Speed=0;
for (i=0; i<context->Color_cycles; i++)
{
Gradient_array[i].Start=context->Cycle_range[i].Start;
Gradient_array[i].End=context->Cycle_range[i].End;
Gradient_array[i].Inverse=context->Cycle_range[i].Inverse;
Gradient_array[i].Speed=context->Cycle_range[i].Speed;
Main_backups->Pages->Gradients->Range[i].Start=context->Cycle_range[i].Start;
Main_backups->Pages->Gradients->Range[i].End=context->Cycle_range[i].End;
Main_backups->Pages->Gradients->Range[i].Inverse=context->Cycle_range[i].Inverse;
Main_backups->Pages->Gradients->Range[i].Speed=context->Cycle_range[i].Speed;
}
}
@@ -1132,12 +1132,12 @@ void Init_context_layered_image(T_IO_Context * context, char *file_name, char *f
// Color cyling ranges:
for (i=0; i<16; i++)
{
if (Gradient_array[i].Start!=Gradient_array[i].End && Gradient_array[i].Speed)
if (Main_backups->Pages->Gradients->Range[i].Start!=Main_backups->Pages->Gradients->Range[i].End && Main_backups->Pages->Gradients->Range[i].Speed)
{
context->Cycle_range[context->Color_cycles].Start=Gradient_array[i].Start;
context->Cycle_range[context->Color_cycles].End=Gradient_array[i].End;
context->Cycle_range[context->Color_cycles].Inverse=Gradient_array[i].Inverse;
context->Cycle_range[context->Color_cycles].Speed=Gradient_array[i].Speed;
context->Cycle_range[context->Color_cycles].Start=Main_backups->Pages->Gradients->Range[i].Start;
context->Cycle_range[context->Color_cycles].End=Main_backups->Pages->Gradients->Range[i].End;
context->Cycle_range[context->Color_cycles].Inverse=Main_backups->Pages->Gradients->Range[i].Inverse;
context->Cycle_range[context->Color_cycles].Speed=Main_backups->Pages->Gradients->Range[i].Speed;
context->Color_cycles++;
}
}