[Bf-blender-cvs] [2dba6ee] mesh-transfer-data: WIP

[Bastien Montagne]

Commit: 2dba6eeb5ba2290733082eb35c015fe8c091434f
Author: Bastien Montagne
Date:   Mon Oct 13 09:52:29 2014 +0200
Branches: mesh-transfer-data
https://developer.blender.org/rB2dba6eeb5ba2290733082eb35c015fe8c091434f

WIP

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

M	source/blender/blenkernel/BKE_mesh_mapping.h
M	source/blender/editors/object/object_transfer_data.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index 739d569..93cee28 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -170,6 +170,11 @@ typedef struct Mesh2MeshMappingIslands {
 } Mesh2MeshMappingIslands;
 
 typedef bool (*loop_island_compute)(struct DerivedMesh *dm, Mesh2MeshMappingIslands *r_islands);
+/* Above vert/UV mapping stuff does not do what we need here, but does things we do not need here.
+ * So better keep them separated for now, I think.
+ */
+bool BKE_loop_island_compute_uv((struct DerivedMesh *dm, Mesh2MeshMappingIslands *r_islands);
+
 
 /* Helpers! */
 void BKE_mesh2mesh_mapping_free(Mesh2MeshMapping *map);
diff --git a/source/blender/editors/object/object_transfer_data.c b/source/blender/editors/object/object_transfer_data.c
index 55451e8..c126a6d 100644
--- a/source/blender/editors/object/object_transfer_data.c
+++ b/source/blender/editors/object/object_transfer_data.c
@@ -267,6 +267,21 @@ static bool data_transfer_check(bContext *UNUSED(C), wmOperator *op)
 
 /* ********** */
 
+static bool data_transfer_get_loop_islands_uv(struct DerivedMesh *dm, Mesh2MeshMappingIslands *r_islands)
+{
+}
+
+static loop_island_compute data_transfer_get_loop_islands_generator(const int data_type)
+{
+	switch (data_type) {
+		case CD_FAKE_UV:
+			break;
+		default:
+			break;
+	}
+	return NULL;
+}
+
 static void data_transfer_interp_char(const DataTransferLayerMapping *UNUSED(laymap), void **sources,
                                       const float *weights, int count, void *dest)
 {
@@ -798,7 +813,6 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
 	SpaceTransform space_transform_data;
 	SpaceTransform *space_transform = use_object_transform ? &space_transform_data : NULL;
 
-	/* Macro to loop through selected objects and perform operation depending on function, option and method.*/
 	CTX_DATA_BEGIN (C, Object *, ob_dst, selected_editable_objects)
 	{
 		if ((ob_dst == ob_src) || (ob_dst->type != OB_MESH)) {