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_image | |
| 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_image')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index fd57bf6101f..2b106e13836 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -376,15 +376,10 @@ static void image_refresh(const bContext *C, ScrArea *sa) /* check if we have to set the image from the editmesh */ if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) { - if (sima->lock == FALSE && G.moving) { - /* pass */ - } - else { - if (scene->nodetree) { - Mask *mask = ED_space_image_get_mask(sima); - if (mask) { - ED_node_composite_job(C, scene->nodetree, scene); - } + if (scene->nodetree) { + Mask *mask = ED_space_image_get_mask(sima); + if (mask) { + ED_node_composite_job(C, scene->nodetree, scene); } } } |