Commit: c9085c06280352cfdbd2e619d92da4c474b65e25
Author: Bastien Montagne
Date: Mon Nov 17 16:01:24 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rBc9085c06280352cfdbd2e619d92da4c474b65e25
Move 'UV' to loops set of data types.
Mostly UI-level only changes...
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenkernel/BKE_object_data_transfer.h
M source/blender/editors/object/object_data_transfer.c
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index b1935e9..e4883c2 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1273,7 +1273,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
split.prop(md, "use_loop_data")
use_loop = md.use_loop_data
row = split.row()
- row.active = use_loop or 'UV' in md.data_types_polys_uv # Exception!
+ row.active = use_loop
row.prop(md, "loop_mapping", text="")
if use_loop:
col = layout.column(align=True)
@@ -1287,6 +1287,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "fromlayers_vcol_select", text="")
row.label(icon='RIGHTARROW')
row.prop(md, "tolayers_vcol_select", text="")
+ split = col.split(0.333, align=True)
+ sub = split.column(align=True)
+ sub.prop(md, "data_types_loops_uv")
+ row = split.row(align=True)
+ row.prop(md, "fromlayers_uv_select", text="")
+ row.label(icon='RIGHTARROW')
+ row.prop(md, "tolayers_uv_select", text="")
layout.separator()
@@ -1300,13 +1307,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = layout.column(align=True)
split = col.split(0.333, align=True)
sub = split.column(align=True)
- sub.prop(md, "data_types_polys_uv")
- row = split.row(align=True)
- row.prop(md, "fromlayers_uv_select", text="")
- row.label(icon='RIGHTARROW')
- row.prop(md, "tolayers_uv_select", text="")
- split = col.split(0.333, align=True)
- sub = split.column(align=True)
sub.prop(md, "data_types_polys")
layout.separator()
diff --git a/source/blender/blenkernel/BKE_object_data_transfer.h
b/source/blender/blenkernel/BKE_object_data_transfer.h
index e714118..8d88148 100644
--- a/source/blender/blenkernel/BKE_object_data_transfer.h
+++ b/source/blender/blenkernel/BKE_object_data_transfer.h
@@ -49,22 +49,23 @@ enum {
DT_TYPE_SHAPEKEY = 1 << 1,
DT_TYPE_SKIN = 1 << 2,
DT_TYPE_BWEIGHT_VERT = 1 << 3,
- DT_TYPE_VERT_ALL = DT_TYPE_MDEFORMVERT |
DT_TYPE_SHAPEKEY | DT_TYPE_SKIN | DT_TYPE_BWEIGHT_VERT,
DT_TYPE_SHARP_EDGE = 1 << 8,
DT_TYPE_SEAM = 1 << 9,
DT_TYPE_CREASE = 1 << 10,
DT_TYPE_BWEIGHT_EDGE = 1 << 11,
DT_TYPE_FREESTYLE_EDGE = 1 << 12,
- DT_TYPE_EDGE_ALL = DT_TYPE_SHARP_EDGE | DT_TYPE_SEAM |
DT_TYPE_CREASE | DT_TYPE_BWEIGHT_EDGE |
- DT_TYPE_FREESTYLE_EDGE,
DT_TYPE_VCOL = 1 << 16,
- DT_TYPE_LOOP_ALL = DT_TYPE_VCOL,
DT_TYPE_UV = 1 << 24,
DT_TYPE_SHARP_FACE = 1 << 25,
DT_TYPE_FREESTYLE_FACE = 1 << 26,
+
+ DT_TYPE_VERT_ALL = DT_TYPE_MDEFORMVERT |
DT_TYPE_SHAPEKEY | DT_TYPE_SKIN | DT_TYPE_BWEIGHT_VERT,
+ DT_TYPE_EDGE_ALL = DT_TYPE_SHARP_EDGE | DT_TYPE_SEAM |
DT_TYPE_CREASE | DT_TYPE_BWEIGHT_EDGE |
+ DT_TYPE_FREESTYLE_EDGE,
+ DT_TYPE_LOOP_ALL = DT_TYPE_VCOL | DT_TYPE_UV,
DT_TYPE_POLY_ALL = DT_TYPE_UV | DT_TYPE_SHARP_FACE |
DT_TYPE_FREESTYLE_FACE,
};
diff --git a/source/blender/editors/object/object_data_transfer.c
b/source/blender/editors/object/object_data_transfer.c
index cacbaee..ad47f86 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -80,8 +80,8 @@ static EnumPropertyItem DT_layer_items[] = {
{DT_TYPE_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Mark",
"Transfer Freestyle edge mark"},
{0, "", 0, "Face Corner Data", ""},
{DT_TYPE_VCOL, "VCOL", 0, "VCol", "Vertex (face corners) colors"},
- {0, "", 0, "Face Data", ""},
{DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"},
+ {0, "", 0, "Face Data", ""},
{DT_TYPE_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer flat/smooth
mark"},
{DT_TYPE_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Mark",
"Transfer Freestyle face mark"},
{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index 7ce681a..d3fb8a5 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4071,16 +4071,16 @@ static void rna_def_modifier_datatransfer(BlenderRNA
*brna)
{DT_TYPE_VCOL, "VCOL", 0, "VCol", "Vertex (face corners)
colors"},
{0, NULL, 0, NULL, NULL}
};
+ static EnumPropertyItem DT_layer_loop_uv_items[] = {
+ {DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"},
+ {0, NULL, 0, NULL, NULL}
+ };
static EnumPropertyItem DT_layer_poly_items[] = {
{DT_TYPE_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer
flat/smooth mark"},
{DT_TYPE_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Mark",
"Transfer Freestyle face mark"},
{0, NULL, 0, NULL, NULL}
};
- static EnumPropertyItem DT_layer_poly_uv_items[] = {
- {DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"},
- {0, NULL, 0, NULL, NULL}
- };
srna = RNA_def_struct(brna, "DataTransferModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Data Transfer Modifier", "Modifier
transferring some data from a source mesh");
@@ -4143,13 +4143,13 @@ static void rna_def_modifier_datatransfer(BlenderRNA
*brna)
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_update(prop, 0,
"rna_DataTransferModifier_data_types_update");
-
- prop = RNA_def_enum(srna, "data_types_polys", DT_layer_poly_items, 0,
"Poly Data Types",
- "Which poly data layers to transfer");
+ prop = RNA_def_enum(srna, "data_types_loops_uv",
DT_layer_loop_uv_items, 0, "Face Corner Data Types",
+ "Which face corner data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_update(prop, 0,
"rna_DataTransferModifier_data_types_update");
- prop = RNA_def_enum(srna, "data_types_polys_uv",
DT_layer_poly_uv_items, 0, "Poly Data Types",
+
+ prop = RNA_def_enum(srna, "data_types_polys", DT_layer_poly_items, 0,
"Poly Data Types",
"Which poly data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
