kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

draw sequences with invalid effect frame ranges pink to highlight they are invalid and wont render.

Browse Source
This commit is contained in:
Campbell Barton 2011-06-07 18:34:33 +00:00
parent 299602b360
commit 7fd1fe9fc8
4 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/sequencer.c
View File

@ -594,7 +594,12 @@ void calc_sequence(Scene *scene, Sequence *seq)
seq->start= seq->enddisp;
seq->enddisp = seq->startdisp;
seq->startdisp= seq->start;
seq->flag |= SEQ_INVALID_EFFECT;
}
else {
seq->flag &= ~SEQ_INVALID_EFFECT;
}
seq->len= seq->enddisp - seq->startdisp;
}
else {

2
source/blender/editors/object/object_vgroup.c
View File

@ -287,7 +287,7 @@ int ED_vgroup_copy_array(Object *ob, Object *ob_from)
if(new_vgroup == TRUE) {
/* free the newly added vgroup since it wasn't compatible */
vgroup_delete_all(ob->data);
vgroup_delete_all(ob);
}
return 0;
}

8
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -550,15 +550,17 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa
glShadeModel(GL_SMOOTH);
glBegin(GL_QUADS);
if(seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -50);
if(seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; }
else if(seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -50);
else UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 0);
glColor3ubv(col);
glVertex2f(x1,y1);
glVertex2f(x2,y1);
if(seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5);
if(seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; }
else if(seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5);
else UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -5);
glColor3ubv((GLubyte *)col);

45
source/blender/makesdna/DNA_sequence_types.h
View File

@ -253,27 +253,30 @@ typedef struct SpeedControlVars {
#define SEQ_NAME_MAXSTR 24
/* seq->flag */
#define SEQ_LEFTSEL 2
#define SEQ_RIGHTSEL 4
#define SEQ_OVERLAP 8
#define SEQ_FILTERY 16
#define SEQ_MUTE 32
#define SEQ_MAKE_PREMUL 64
#define SEQ_REVERSE_FRAMES 128
#define SEQ_IPO_FRAME_LOCKED 256
#define SEQ_EFFECT_NOT_LOADED 512
#define SEQ_FLAG_DELETE 1024
#define SEQ_FLIPX 2048
#define SEQ_FLIPY 4096
#define SEQ_MAKE_FLOAT 8192
#define SEQ_LOCK 16384
#define SEQ_USE_PROXY 32768
#define SEQ_USE_TRANSFORM 65536
#define SEQ_USE_CROP 131072
#define SEQ_USE_COLOR_BALANCE 262144
#define SEQ_USE_PROXY_CUSTOM_DIR 524288
#define SEQ_USE_PROXY_CUSTOM_FILE 2097152
#define SEQ_USE_EFFECT_DEFAULT_FADE 4194304
#define SEQ_LEFTSEL (1<<1)
#define SEQ_RIGHTSEL (1<<2)
#define SEQ_OVERLAP (1<<3)
#define SEQ_FILTERY (1<<4)
#define SEQ_MUTE (1<<5)
#define SEQ_MAKE_PREMUL (1<<6)
#define SEQ_REVERSE_FRAMES (1<<7)
#define SEQ_IPO_FRAME_LOCKED (1<<8)
#define SEQ_EFFECT_NOT_LOADED (1<<9)
#define SEQ_FLAG_DELETE (1<<10)
#define SEQ_FLIPX (1<<11)
#define SEQ_FLIPY (1<<12)
#define SEQ_MAKE_FLOAT (1<<13)
#define SEQ_LOCK (1<<14)
#define SEQ_USE_PROXY (1<<15)
#define SEQ_USE_TRANSFORM (1<<16)
#define SEQ_USE_CROP (1<<17)
#define SEQ_USE_COLOR_BALANCE (1<<18)
#define SEQ_USE_PROXY_CUSTOM_DIR (1<<19)
#define SEQ_USE_PROXY_CUSTOM_FILE (1<<21)
#define SEQ_USE_EFFECT_DEFAULT_FADE (1<<22)
#define SEQ_INVALID_EFFECT (1<<31)
/* convenience define for all selection flags */
#define SEQ_ALLSEL (SELECT+SEQ_LEFTSEL+SEQ_RIGHTSEL)