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/blenkernel/intern/mball.c | |
| 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/blenkernel/intern/mball.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 0546c85db67..d09490db235 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -2283,7 +2283,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) if (process.totelem == 0) return; if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return; - if (G.moving && mb->flag == MB_UPDATE_FAST) return; + if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_FAST) return; process.thresh = mb->thresh; @@ -2325,7 +2325,7 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) } else { width = mb->wiresize; - if (G.moving && mb->flag == MB_UPDATE_HALFRES) width *= 2; + if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag == MB_UPDATE_HALFRES) width *= 2; } /* nr_cubes is just for safety, minimum is totsize */ nr_cubes = (int)(0.5f + totsize / width); |