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/transform/transform_conversions.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/editors/transform/transform_conversions.c')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 81af26b0d05..44c2158bf74 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5701,6 +5701,21 @@ void special_aftertrans_update(bContext *C, TransInfo *t) #endif } +int special_transform_moving(TransInfo *t) +{ + if (t->spacetype == SPACE_SEQ) { + return G_TRANSFORM_SEQ; + } + else if (t->obedit || ((t->flag & T_POSE) && (t->poseobj))) { + return G_TRANSFORM_EDIT; + } + else if (t->flag & (T_OBJECT | T_TEXTURE)) { + return G_TRANSFORM_OBJ; + } + + return 0; +} + static void createTransObject(bContext *C, TransInfo *t) { TransData *td = NULL; |