[Bf-blender-cvs] [a785835b2c9] master: Fix T69299: Transform origin & skip-children jitters

Campbell Barton noreply at git.blender.org
Fri Aug 30 19:42:59 CEST 2019


Commit: a785835b2c90520094e9600c6e22bff26c969364
Author: Campbell Barton
Date:   Sat Aug 31 03:36:13 2019 +1000
Branches: master
https://developer.blender.org/rBa785835b2c90520094e9600c6e22bff26c969364

Fix T69299: Transform origin & skip-children jitters

===================================================================

M	source/blender/editors/transform/transform_generics.c

===================================================================

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index a4afd62ab0f..7ae140e1815 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1151,13 +1151,13 @@ static void recalcData_objects(TransInfo *t)
       ED_objects_recalculate_paths(t->context, t->scene, true);
     }
 
-    if (t->options & CTX_OBMODE_XFORM_OBDATA) {
-      trans_obdata_in_obmode_update_all(t);
-    }
-
     if (t->options & CTX_OBMODE_XFORM_SKIP_CHILDREN) {
       trans_obchild_in_obmode_update_all(t);
     }
+
+    if (t->options & CTX_OBMODE_XFORM_OBDATA) {
+      trans_obdata_in_obmode_update_all(t);
+    }
   }
 }



More information about the Bf-blender-cvs mailing list