[Bf-blender-cvs] [f99beb730aa] master: Fix T96347: Pose gizmo shown at wrong location with multiple objects

Campbell Barton noreply at git.blender.org
Tue Mar 29 03:58:42 CEST 2022


Commit: f99beb730aa822d8b0b77bf85dbe0db5c7b757a3
Author: Campbell Barton
Date:   Tue Mar 29 12:49:04 2022 +1100
Branches: master
https://developer.blender.org/rBf99beb730aa822d8b0b77bf85dbe0db5c7b757a3

Fix T96347: Pose gizmo shown at wrong location with multiple objects

Regression in [0] error iterating over pose bones which only used the
active-object, also follow the same logic as edit-mode for using the
local-matrix.

[0]: d052169e7e4b84b5d621fcbf15b187a4951f1f70

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

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

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

diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 955916ff437..aa8dad2b95f 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -939,7 +939,7 @@ int ED_transform_calc_gizmo_stats(const bContext *C,
 
     for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
       Object *ob_iter = objects[ob_index];
-      const bool use_mat_local = params->use_local_axis && (ob_iter != ob);
+      const bool use_mat_local = (ob_iter != ob);
       /* mislead counting bones... bah. We don't know the gizmo mode, could be mixed */
       const int mode = TFM_ROTATION;
 
@@ -951,7 +951,7 @@ int ED_transform_calc_gizmo_stats(const bContext *C,
       }
 
       /* Use channels to get stats. */
-      LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+      LISTBASE_FOREACH (bPoseChannel *, pchan, &ob_iter->pose->chanbase) {
         if (!(pchan->bone->flag & BONE_TRANSFORM)) {
           continue;
         }



More information about the Bf-blender-cvs mailing list