Fix T85471: Wrong orientation in transforming objects in weight paint mode

The local orientation chosen was that of the active object, but as
confirmed in other parts of the code, the orientation of the selected
Bone has priority.

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 16fb9cc6eab..92719933afb 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -44,6 +44,7 @@
 #include "BKE_context.h"
 #include "BKE_layer.h"
 #include "BKE_mask.h"
+#include "BKE_modifier.h"
 #include "BKE_paint.h"
 
 #include "ED_clip.h"
@@ -1454,3 +1455,23 @@ void transform_data_ext_rotate(TransData *td, float mat[3][3], bool use_drot)
     copy_v3_v3(td->ext->rot, eul);
   }
 }
+
+Object *transform_object_deform_pose_armature_get(TransInfo *t, Object *ob)
+{
+  if (!(ob->mode & OB_MODE_ALL_WEIGHT_PAINT)) {
+    return NULL;
+  }
+  /* Important that ob_armature can be set even when its not selected T23412.
+   * Lines below just check is also visible. */
+  Object *ob_armature = BKE_modifiers_is_deformed_by_armature(ob);
+  if (ob_armature && ob_armature->mode & OB_MODE_POSE) {
+    Base *base_arm = BKE_view_layer_base_find(t->view_layer, ob_armature);
+    if (base_arm) {
+      View3D *v3d = t->view;
+      if (BASE_VISIBLE(v3d, base_arm)) {
+        return ob_armature;
+      }
+    }
+  }
+  return NULL;
+}