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

- sequencer wasnt drawing handles, the deprecated v2d was being used which gave a pixely of -nan.

Browse Source 
- removed bf_editors from cmake since there now split up.
This commit is contained in:
Campbell Barton 2010-07-11 12:39:50 +00:00
parent 6ef92ab52e
commit 834f2a42ce
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,14 +365,13 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire
}
}
static void draw_seq_extensions(Scene *scene, SpaceSeq *sseq, Sequence *seq)
static void draw_seq_extensions(Scene *scene, ARegion *ar, SpaceSeq *sseq, Sequence *seq)
{
float x1, x2, y1, y2, pixely, a;
char col[3], blendcol[3];
View2D *v2d= &sseq->v2d;
View2D *v2d= &ar->v2d;
if(seq->type >= SEQ_EFFECT) return;
if(v2d->mask.ymax == v2d->mask.ymin) return; /* avoid divide by zero */
x1= seq->startdisp;
x2= seq->enddisp;
@ -625,7 +624,7 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, SpaceSeq *sseq, Sequence *
/* draw additional info and controls */
if (!is_single_image)
draw_seq_extensions(scene, sseq, seq);
draw_seq_extensions(scene, ar, sseq, seq);
draw_seq_handle(v2d, seq, pixelx, SEQ_LEFTHANDLE);
draw_seq_handle(v2d, seq, pixelx, SEQ_RIGHTHANDLE);

1
source/creator/CMakeLists.txt
View File

@ -425,7 +425,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
blender_CTR
bf_moto
bf_windowmanager
bf_editors
bf_blroutines
bf_converter
bf_dummy