archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T46522: DataTransfer modifier: Impossible to set multiple transfer modes by script

Browse Source 
(if they're on different properties).

This patch basically gets rid of (ui-related) hack where we was adding specific
'fake' enums for datatypes needing additional options.

That was done because of broken UI code - to summarize, 'align' code did not support
correctly layout mixing vertical and horizontal sub-layouts, in particular if
it was 'column-major'.

A complete rewrite of this align code has been done, so now we can use a more
sane UI code.
This commit is contained in:
Bastien Montagne
2015-10-19 23:22:12 +02:00
parent e77e018d48
commit 02f3cebf6e
2 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -1276,14 +1276,14 @@ 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_verts_vgroup")
row = split.row(align=True)
row.prop(md, "layers_vgroup_select_src", text="")
row.label(icon='RIGHTARROW_THIN')
row.prop(md, "layers_vgroup_select_dst", text="")
split = col.split(0.333, align=True)
sub = split.column(align=True)
sub.prop(md, "data_types_verts")
sub = split.column(align=True)
row = sub.row(align=True)
row.prop(md, "layers_vgroup_select_src", text="")
row.label(icon='RIGHTARROW')
row.prop(md, "layers_vgroup_select_dst", text="")
row = sub.row(align=True)
row.label("", icon='NONE')
layout.separator()
@@ -1312,17 +1312,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
split = col.split(0.333, align=True)
sub = split.column(align=True)
sub.prop(md, "data_types_loops")
split = col.split(0.333, align=True)
sub = split.column(align=True)
sub.prop(md, "data_types_loops_vcol")
row = split.row(align=True)
row = sub.row(align=True)
row.label("", icon='NONE')
row = sub.row(align=True)
row.prop(md, "layers_vcol_select_src", text="")
row.label(icon='RIGHTARROW')
row.prop(md, "layers_vcol_select_dst", 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 = sub.row(align=True)
row.prop(md, "layers_uv_select_src", text="")
row.label(icon='RIGHTARROW')
row.prop(md, "layers_uv_select_dst", text="")

71
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -825,6 +825,38 @@ static void rna_DataTransferModifier_data_types_update(Main *bmain, Scene *scene
rna_Modifier_update(bmain, scene, ptr);
}
static void rna_DataTransferModifier_verts_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_VERT_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_edges_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_EDGE_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_loops_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_LOOP_ALL;
dtmd->data_types |= value;
}
static void rna_DataTransferModifier_polys_data_types_set(struct PointerRNA *ptr, int value)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
dtmd->data_types &= ~DT_TYPE_POLY_ALL;
dtmd->data_types |= value;
}
static EnumPropertyItem *rna_DataTransferModifier_layers_select_src_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *prop, bool *r_free)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)ptr->data;
@@ -4266,22 +4298,16 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem DT_layer_vert_items[] = {
{DT_TYPE_MDEFORMVERT, "VGROUP_WEIGHTS", 0, "Vertex Group(s)", "Transfer active or all vertex groups"},
#if 0 /* TODO */
{DT_TYPE_SHAPEKEY, "SHAPEKEYS", 0, "Shapekey(s)", "Transfer active or all shape keys"},
#endif
#if 0 /* XXX When SkinModifier is enabled, it seems to erase its own CD_MVERT_SKIN layer from final DM :( */
{DT_TYPE_SKIN, "SKIN", 0, "Skin Weight", "Transfer skin weights"},
#endif
{DT_TYPE_BWEIGHT_VERT, "BEVEL_WEIGHT_VERT", 0, "Bevel Weight", "Transfer bevel weights"},
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem DT_layer_vert_vgroup_items[] = {
{DT_TYPE_MDEFORMVERT, "VGROUP_WEIGHTS", 0, "Vertex Group(s)", "Transfer active or all vertex groups"},
{0, NULL, 0, NULL, NULL}
};
#if 0 /* XXX For now, would like to finish/merge work from 2014 gsoc first. */
static EnumPropertyItem DT_layer_vert_shapekey_items[] = {
{DT_TYPE_SHAPEKEY, "SHAPEKEYS", 0, "Shapekey(s)", "Transfer active or all shape keys"},
{0, NULL, 0, NULL, NULL}
};
#endif
static EnumPropertyItem DT_layer_edge_items[] = {
{DT_TYPE_SHARP_EDGE, "SHARP_EDGE", 0, "Sharp", "Transfer sharp mark"},
@@ -4294,13 +4320,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
static EnumPropertyItem DT_layer_loop_items[] = {
{DT_TYPE_LNOR, "CUSTOM_NORMAL", 0, "Custom Normals", "Transfer custom normals"},
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem DT_layer_loop_vcol_items[] = {
{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}
};
@@ -4350,39 +4370,28 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
"Which vertex 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_verts_vgroup", DT_layer_vert_vgroup_items, 0, "Vertex Data Types",
"Which vertex data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_verts_data_types_set", NULL);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
prop = RNA_def_enum(srna, "data_types_edges", DT_layer_edge_items, 0, "Edge Data Types",
"Which edge data layers to transfer");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_edges_data_types_set", NULL);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
prop = RNA_def_enum(srna, "data_types_loops", DT_layer_loop_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_loops_vcol", DT_layer_loop_vcol_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_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_enum_funcs(prop, NULL, "rna_DataTransferModifier_loops_data_types_set", NULL);
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");
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
RNA_def_property_enum_sdna(prop, NULL, "data_types");
RNA_def_property_enum_funcs(prop, NULL, "rna_DataTransferModifier_polys_data_types_set", NULL);
RNA_def_property_update(prop, 0, "rna_DataTransferModifier_data_types_update");
/* Mapping methods. */