[Bf-blender-cvs] [82298eb] mesh-transfer-data: Fix for last merge.

Bastien Montagne noreply at git.blender.org
Wed Nov 19 00:04:14 CET 2014


Commit: 82298ebeef183b835a1989a82cfab3150617ecda
Author: Bastien Montagne
Date:   Wed Nov 19 00:03:50 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB82298ebeef183b835a1989a82cfab3150617ecda

Fix for last merge.

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

M	source/blender/blenkernel/intern/deform.c

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

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 7615c78..111f114 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -1340,16 +1340,16 @@ bool data_transfer_layersmapping_vgroups(
 
 		switch (fromlayers) {
 			case DT_LAYERS_ALL_SRC:
-				use_layers_src = BKE_objdef_vgroup_subset_from_select_type(ob_src, WT_VGROUP_ALL,
-				                                                           &num_src, &num_sel_unused);
+				use_layers_src = BKE_object_defgroup_subset_from_select_type(ob_src, WT_VGROUP_ALL,
+				                                                             &num_src, &num_sel_unused);
 				break;
 			case DT_LAYERS_VGROUP_SRC_BONE_SELECT:
-				use_layers_src = BKE_objdef_vgroup_subset_from_select_type(ob_src, WT_VGROUP_BONE_SELECT,
-				                                                           &num_src, &num_sel_unused);
+				use_layers_src = BKE_object_defgroup_subset_from_select_type(ob_src, WT_VGROUP_BONE_SELECT,
+				                                                             &num_src, &num_sel_unused);
 				break;
 			case DT_LAYERS_VGROUP_SRC_BONE_DEFORM:
-				use_layers_src = BKE_objdef_vgroup_subset_from_select_type(ob_src, WT_VGROUP_BONE_DEFORM,
-				                                                           &num_src, &num_sel_unused);
+				use_layers_src = BKE_object_defgroup_subset_from_select_type(ob_src, WT_VGROUP_BONE_DEFORM,
+				                                                             &num_src, &num_sel_unused);
 				break;
 		}




More information about the Bf-blender-cvs mailing list