diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:37 +0400 |
| commit | 28dd9c6a40859bf8d707b072174557d37240f162 (patch) | |
| tree | c5436dcea18b4e70b1c363f84d1a52bf050a8a36 /source/blender/editors/space_sequencer | |
| parent | 02fbfa5c70732e691606546ecce60fdfe3f80d9f (diff) | |
Fix #35767: transforming nodes in the node editor changed the wireframe color
of the active object in the 3D view. This was due to sharing a global G.moving
flag to indicate that transform is active, now it's only set per transform data
type so different editors don't influence each other.
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 20374e562e9..af4b4055156 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -403,7 +403,7 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, const float handsize_cla glDisable(GL_BLEND); } - if (G.moving || (seq->flag & whichsel)) { + if ((G.moving & G_TRANSFORM_SEQ) || (seq->flag & whichsel)) { const char col[4] = {255, 255, 255, 255}; if (direction == SEQ_LEFTHANDLE) { BLI_snprintf(numstr, sizeof(numstr), "%d", seq->startdisp); @@ -760,7 +760,7 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline } get_seq_color3ubv(scene, seq, col); - if (G.moving && (seq->flag & SELECT)) { + if ((G.moving & G_TRANSFORM_SEQ) && (seq->flag & SELECT)) { if (seq->flag & SEQ_OVERLAP) { col[0] = 255; col[1] = col[2] = 40; } |