[Bf-blender-cvs] [53ae543] mesh-transfer-data: Remove option to create data from modifier, does not work well.

[Bastien Montagne]

Commit: 53ae5436b7a128b60dc690872629977cccaf82cb
Author: Bastien Montagne
Date:   Mon Nov 17 11:54:25 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB53ae5436b7a128b60dc690872629977cccaf82cb

Remove option to create data from modifier, does not work well.

Will be replaced by an operator.

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_datatransfer.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index e374cc8..b1935e9 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1330,7 +1330,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "mix_factor")
 
         col = split.column()
-        col.prop(md, "use_create")
+        col.label("")
         row = col.row(align=True)
         row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         sub = row.row(align=True)
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index eb97ee1..5d25603 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1396,10 +1396,9 @@ typedef struct DataTransferModifierData {
 
 /* DataTransferModifierData.flags */
 enum {
-	MOD_DATATRANSFER_USE_CREATE       = 1 << 0,
-	MOD_DATATRANSFER_OBSRC_TRANSFORM  = 1 << 1,
-	MOD_DATATRANSFER_MAP_MAXDIST      = 1 << 2,
-	MOD_DATATRANSFER_INVERT_VGROUP    = 1 << 3,
+	MOD_DATATRANSFER_OBSRC_TRANSFORM  = 1 << 0,
+	MOD_DATATRANSFER_MAP_MAXDIST      = 1 << 1,
+	MOD_DATATRANSFER_INVERT_VGROUP    = 1 << 2,
 
 	/* Only for UI really. */
 	MOD_DATATRANSFER_USE_VERT         = 1 << 28,
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 479b1b2..7ce681a 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4254,10 +4254,6 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_DataTransferModifier_mix_mode_itemf");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
-	prop = RNA_def_boolean(srna, "use_create", true, "Create Data", "Add data layers on destination meshes if needed");
-	RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DATATRANSFER_USE_CREATE);
-	RNA_def_property_update(prop, 0, "rna_Modifier_update");
-
 	prop = RNA_def_float(srna, "mix_factor", 1.0f, 0.0f, 1.0f, "Mix Factor",
 	                     "Factor to use when applying data to destination (exact behavior depends on mix mode)",
 	                     0.0f, 1.0f);
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 620f653..a3ca9e0 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -78,7 +78,7 @@ static void initData(ModifierData *md)
 	dtmd->mix_factor         = 1.0f;
 	dtmd->defgrp_name[0]     = '\0';
 
-	dtmd->flags              = MOD_DATATRANSFER_USE_CREATE | MOD_DATATRANSFER_OBSRC_TRANSFORM;
+	dtmd->flags              = MOD_DATATRANSFER_OBSRC_TRANSFORM;
 }
 
 static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
@@ -158,7 +158,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 	DerivedMesh *dm = derivedData;
 	ReportList reports;
 
-	const bool use_create = (dtmd->flags & MOD_DATATRANSFER_USE_CREATE) != 0;
 	const bool invert_vgroup = (dtmd->flags & MOD_DATATRANSFER_INVERT_VGROUP) != 0;
 
 	const float max_dist = (dtmd->flags & MOD_DATATRANSFER_MAP_MAXDIST) ? dtmd->map_max_distance : FLT_MAX;
@@ -172,7 +171,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 
 	BKE_reports_init(&reports, RPT_STORE);
 
-	BKE_object_data_transfer_dm(md->scene, dtmd->ob_source, ob, dm, dtmd->data_types, use_create,
+	BKE_object_data_transfer_dm(md->scene, dtmd->ob_source, ob, dm, dtmd->data_types, false,
 	                     dtmd->vmap_mode, dtmd->emap_mode, dtmd->lmap_mode, dtmd->pmap_mode,
 	                     space_transform, max_dist, dtmd->map_ray_radius,
 	                     dtmd->layers_select_src, dtmd->layers_select_dst,