Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2006-11-09 21:58:02 +0300
committerPeter Schlaile <peter@schlaile.de>2006-11-09 21:58:02 +0300
commit0df60a9ef437afbcd2bad259dd93fd66e3e10fe8 (patch)
treedd62d465528f9ffc1453606d6d51b85109e1541b /source/blender/src/drawseq.c
parentd1285dc756711b6dccb30a30df661376fe513bee (diff)
== Sequencer ==
Added enhancements by blendix (Patch #4919: Insert sequence effect between) It adds the following things: - You can add a sequence strip afterwards in the middle of an effect chain (you have to move strips around before, so that there is "room" for it. Blender will ask you then, if you want to add in between or after the selected strips) - In the case you messed it up and want your effect strips to be reassigned in a different way, there is the new "R"-key. Just select three arbitrary strips and press "R". If you don't create a cycle, those will be connected to a new effect chain. - Fixed freeing of imbufs on changes to properly take into account dependencies. An example of a simple case that went wrong is one image strip with two glow effects, changing the parameters of the first glow strip will not result in any updates. Basically only direct dependencies were taken into account, which resulted in the image preview not being updated in some cases. - Let the sequencer detect an active sequence strip if none is defined, to get rid of annoying error messages when trying to add an effect to a selected sequence strip right after loading a file. - Delete is less destructive. If you delete somewhere between other strips, Blender now tries to relink in a reasonable way. - The active sequence strip is now displayed with a light instead of a dark outline, which makes it easier to spot, and is especially useful for the tools using the active sequence strip. - Ability to view the final result when editing inside meta strip. The channel button was modified to also allow negative numbers, where -n is n levels up the meta stack. There is probably a nicer way to specify this, instead of (ab)using the channel button, but this seems to work quite efficient. - Also a small bugfix: don't crash on loading files from newer versions with an unknown effect strip.
Diffstat (limited to 'source/blender/src/drawseq.c')
-rw-r--r--source/blender/src/drawseq.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 5492dd40ff5..5597e5f07da 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -671,6 +671,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq)
{
float x1, x2, y1, y2;
char col[3];
+ Sequence *last_seq = get_last_seq();
/* body */
if(seq->startstill) x1= seq->start;
@@ -703,6 +704,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq)
col[0]= 255; col[1]= col[2]= 40;
} else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 120);
}
+ else if (seq == last_seq) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 120);
else if (seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -150);
else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -60);
@@ -1004,17 +1006,13 @@ void do_seqbuttons(short val)
switch(val) {
case SEQ_BUT_PLUGIN:
- new_stripdata(last_seq);
- free_imbuf_effect_spec(CFRA);
+ case SEQ_BUT_EFFECT:
+ update_changed_seq_and_deps(last_seq, 0, 1);
break;
case SEQ_BUT_RELOAD:
free_imbuf_seq(); // frees all
break;
- case SEQ_BUT_EFFECT:
- new_stripdata(last_seq);
- calc_sequence(last_seq);
- break;
}
allqueue(REDRAWSEQ, 0);