[Bf-blender-cvs] [35bc5bc] mesh-transfer-data: Minor cleanup

Bastien Montagne noreply at git.blender.org
Mon Nov 3 20:57:51 CET 2014


Commit: 35bc5bcbff74d931e7afa5f24faaa663541d8794
Author: Bastien Montagne
Date:   Mon Nov 3 17:53:29 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB35bc5bcbff74d931e7afa5f24faaa663541d8794

Minor cleanup

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

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

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

diff --git a/source/blender/editors/object/object_transfer_data.c b/source/blender/editors/object/object_transfer_data.c
index 2082667..ed6ab53 100644
--- a/source/blender/editors/object/object_transfer_data.c
+++ b/source/blender/editors/object/object_transfer_data.c
@@ -790,10 +790,10 @@ bool ED_data_transfer(
 		dm_src_mask |= (1LL << data_type);
 	}
 	else if (data_type == CD_FAKE_MDEFORMVERT) {
-		dm_src_mask |= (1LL << CD_MDEFORMVERT);  /* Exception for vgroups :/ */
+		dm_src_mask |= CD_MASK_MDEFORMVERT;  /* Exception for vgroups :/ */
 	}
 	else if (data_type == CD_FAKE_UV) {
-		dm_src_mask |= (1LL << CD_MTEXPOLY) | (1LL << CD_MLOOPUV);
+		dm_src_mask |= CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV;
 	}
 	dm_src = mesh_get_derived_final(scene, ob_src, dm_src_mask);
 	me_dst = ob_dst->data;




More information about the Bf-blender-cvs mailing list