[Bf-blender-cvs] [1ae8855f8e2] blender-v2.90-release: Fix T78308: Weight Transfer Operator "Deform Pose Bones" destination setting doesn't work.

Bastien Montagne noreply at git.blender.org
Mon Jul 27 18:14:13 CEST 2020


Commit: 1ae8855f8e2dfd5aa710fa521be75be0c81a5971
Author: Bastien Montagne
Date:   Mon Jul 27 18:12:40 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB1ae8855f8e2dfd5aa710fa521be75be0c81a5971

Fix T78308: Weight Transfer Operator "Deform Pose Bones" destination setting doesn't work.

Some modes were working by mere chance in that ugly 'reversed' case, but
the to/from selection modes were not properly swapped...

Should also be safe for 2.83.

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

M	source/blender/editors/object/object_data_transfer.c

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

diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index aebc77ec44b..5a0656ee916 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -420,8 +420,8 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
   const float ray_radius = RNA_float_get(op->ptr, "ray_radius");
   const float islands_precision = RNA_float_get(op->ptr, "islands_precision");
 
-  const int layers_src = RNA_enum_get(op->ptr, "layers_select_src");
-  const int layers_dst = RNA_enum_get(op->ptr, "layers_select_dst");
+  int layers_src = RNA_enum_get(op->ptr, "layers_select_src");
+  int layers_dst = RNA_enum_get(op->ptr, "layers_select_dst");
   int layers_select_src[DT_MULTILAYER_INDEX_MAX] = {0};
   int layers_select_dst[DT_MULTILAYER_INDEX_MAX] = {0};
   const int fromto_idx = BKE_object_data_transfer_dttype_to_srcdst_index(data_type);
@@ -447,6 +447,10 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
+  if (reverse_transfer) {
+    SWAP(int, layers_src, layers_dst);
+  }
+
   if (fromto_idx != DT_MULTILAYER_INDEX_INVALID) {
     layers_select_src[fromto_idx] = layers_src;
     layers_select_dst[fromto_idx] = layers_dst;



More information about the Bf-blender-cvs mailing list