[Bf-blender-cvs] [2692ec06d18] modifier-panels-ui: Data transfer modifier UI update
Hans Goudey
noreply at git.blender.org
Wed Apr 8 18:48:18 CEST 2020
Commit: 2692ec06d1814349c98b66d8ee972d99edfcd3f4
Author: Hans Goudey
Date: Wed Apr 8 11:48:10 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB2692ec06d1814349c98b66d8ee972d99edfcd3f4
Data transfer modifier UI update
===================================================================
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_datatransfer.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index a2b8848fcbc..8930d1b8e51 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5920,7 +5920,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
{DT_TYPE_MDEFORMVERT,
"VGROUP_WEIGHTS",
0,
- "Vertex Group(s)",
+ "Vertex Groups",
"Transfer active or all vertex groups"},
# if 0 /* TODO */
{DT_TYPE_SHAPEKEY, "SHAPEKEYS", 0, "Shapekey(s)", "Transfer active or all shape keys"},
@@ -5937,19 +5937,15 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
static const EnumPropertyItem DT_layer_edge_items[] = {
{DT_TYPE_SHARP_EDGE, "SHARP_EDGE", 0, "Sharp", "Transfer sharp mark"},
{DT_TYPE_SEAM, "SEAM", 0, "UV Seam", "Transfer UV seam mark"},
- {DT_TYPE_CREASE, "CREASE", 0, "Subsurf Crease", "Transfer crease values"},
+ {DT_TYPE_CREASE, "CREASE", 0, "Crease", "Transfer subdivision crease values"},
{DT_TYPE_BWEIGHT_EDGE, "BEVEL_WEIGHT_EDGE", 0, "Bevel Weight", "Transfer bevel weights"},
- {DT_TYPE_FREESTYLE_EDGE,
- "FREESTYLE_EDGE",
- 0,
- "Freestyle Mark",
- "Transfer Freestyle edge mark"},
+ {DT_TYPE_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle", "Transfer Freestyle edge mark"},
{0, NULL, 0, NULL, NULL},
};
static const EnumPropertyItem DT_layer_loop_items[] = {
{DT_TYPE_LNOR, "CUSTOM_NORMAL", 0, "Custom Normals", "Transfer custom normals"},
- {DT_TYPE_VCOL, "VCOL", 0, "VCol", "Vertex (face corners) colors"},
+ {DT_TYPE_VCOL, "VCOL", 0, "Vertex Colors", "Vertex (face corners) colors"},
{DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"},
{0, NULL, 0, NULL, NULL},
};
@@ -6132,7 +6128,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna)
0.0f,
0.0f,
1.0f,
- "Islands Handling Refinement",
+ "Islands Precision",
"Factor controlling precision of islands handling "
"(typically, 0.1 should be enough, higher values can make things really slow)",
0.0f,
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 78829826f5b..11403995f20 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -260,11 +260,16 @@ static void panel_draw(const bContext *C, Panel *panel)
row = uiLayoutRow(layout, true);
uiItemR(row, &ptr, "object", 0, IFACE_("Source"), ICON_NONE);
- uiItemR(row, &ptr, "use_object_transform", 0, "", ICON_ORIENTATION_GLOBAL);
+ sub = uiLayoutRow(row, true);
+ uiLayoutSetPropDecorate(sub, false);
+ uiItemR(sub, &ptr, "use_object_transform", 0, "", ICON_ORIENTATION_GLOBAL);
row = uiLayoutRow(layout, true);
uiItemR(row, &ptr, "max_distance", 0, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_max_distance", 0, "", ICON_STYLUS_PRESSURE);
+ sub = uiLayoutRow(row, true);
+ uiLayoutSetPropDecorate(sub, false);
+ uiItemR(sub, &ptr, "use_max_distance", 0, "", ICON_STYLUS_PRESSURE);
+
uiItemR(layout, &ptr, "ray_radius", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "mix_mode", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "mix_factor", 0, NULL, ICON_NONE);
@@ -273,8 +278,7 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE);
sub = uiLayoutColumn(row, true);
uiLayoutSetActive(sub, has_vertex_group);
- uiLayoutSetPropSep(sub, false);
-
+ uiLayoutSetPropDecorate(sub, false);
uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
uiItemO(layout, "Generate Data Layers", ICON_NONE, "OBJECT_OT_datalayout_transfer");
@@ -293,30 +297,19 @@ static void vertex_panel_draw_header(const bContext *C, Panel *panel)
static void vertex_panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *row;
uiLayout *layout = panel->layout;
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
- uiLayoutSetPropSep(layout, true);
-
bool use_vert_data = RNA_boolean_get(&ptr, "use_vert_data");
uiLayoutSetActive(layout, use_vert_data);
- uiItemR(layout, &ptr, "vert_mapping", 0, IFACE_("Mapping"), ICON_NONE);
- row = uiLayoutRow(layout, false);
- uiItemR(row, &ptr, "data_types_verts", 0, IFACE_("Data Types"), ICON_NONE);
-}
-static void vertex_vgroup_panel_draw_header(const bContext *C, Panel *panel)
-{
- uiLayout *layout = panel->layout;
+ uiItemR(layout, &ptr, "data_types_verts", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
- PointerRNA ptr;
- modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetPropSep(layout, true);
- PropertyRNA *prop = RNA_struct_find_property(&ptr, "data_types_verts");
- uiItemFullR(layout, &ptr, prop, 0, 1, 0, NULL, ICON_NONE);
+ uiItemR(layout, &ptr, "vert_mapping", 0, IFACE_("Mapping"), ICON_NONE);
}
static void vertex_vgroup_panel_draw(const bContext *C, Panel *panel)
@@ -326,11 +319,12 @@ static void vertex_vgroup_panel_draw(const bContext *C, Panel *panel)
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetActive(layout, RNA_enum_get(&ptr, "data_types_verts") & DT_TYPE_MDEFORMVERT);
+
uiLayoutSetPropSep(layout, true);
- uiLayoutSetActive(layout, RNA_enum_get(&ptr, "data_types_verts") & DT_TYPE_MDEFORMVERT);
- uiItemR(layout, &ptr, "layers_vgroup_select_src", 0, NULL, ICON_NONE);
- uiItemR(layout, &ptr, "layers_vgroup_select_dst", 0, NULL, ICON_NONE);
+ uiItemR(layout, &ptr, "layers_vgroup_select_src", 0, IFACE_("Layer Selection"), ICON_NONE);
+ uiItemR(layout, &ptr, "layers_vgroup_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE);
}
static void edge_panel_draw_header(const bContext *C, Panel *panel)
@@ -350,12 +344,13 @@ static void edge_panel_draw(const bContext *C, Panel *panel)
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_edge_data"));
+
+ uiItemR(layout, &ptr, "data_types_edges", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+
uiLayoutSetPropSep(layout, true);
- bool use_edge_data = RNA_boolean_get(&ptr, "use_edge_data");
- uiLayoutSetActive(layout, use_edge_data);
uiItemR(layout, &ptr, "edge_mapping", 0, IFACE_("Mapping"), ICON_NONE);
- uiItemR(layout, &ptr, "data_types_edges", 0, IFACE_("Data Types"), ICON_NONE);
}
static void face_corner_panel_draw_header(const bContext *C, Panel *panel)
@@ -370,41 +365,49 @@ static void face_corner_panel_draw_header(const bContext *C, Panel *panel)
static void face_corner_panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *row, *split, *col;
uiLayout *layout = panel->layout;
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_loop_data"));
+
+ uiItemR(layout, &ptr, "data_types_loops", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+
uiLayoutSetPropSep(layout, true);
- bool use_loop_data = RNA_boolean_get(&ptr, "use_loop_data");
- uiLayoutSetActive(layout, use_loop_data);
uiItemR(layout, &ptr, "loop_mapping", 0, IFACE_("Mapping"), ICON_NONE);
- row = uiLayoutRow(layout, false);
- uiItemR(row, &ptr, "data_types_loops", 0, IFACE_("Data Types"), ICON_NONE);
-
- if (RNA_enum_get(&ptr, "data_types_loops") & DT_TYPE_VCOL) {
- split = uiLayoutSplit(layout, 0.3333f, false);
- col = uiLayoutColumn(split, false);
- uiItemL(col, IFACE_("Vertex Colors:"), ICON_NONE);
- col = uiLayoutColumn(split, false);
- row = uiLayoutRow(col, false);
- uiItemR(row, &ptr, "layers_vcol_select_src", 0, "", ICON_NONE);
- uiItemL(row, NULL, ICON_RIGHTARROW);
- uiItemR(row, &ptr, "layers_vcol_select_dst", 0, "", ICON_NONE);
- }
- if (RNA_enum_get(&ptr, "data_types_loops") & DT_TYPE_UV) {
- split = uiLayoutSplit(layout, 0.3333f, false);
- col = uiLayoutColumn(split, false);
- uiItemL(col, IFACE_("UVs:"), ICON_NONE);
- col = uiLayoutColumn(split, false);
- row = uiLayoutRow(col, false);
- uiItemR(row, &ptr, "layers_uv_select_src", 0, "", ICON_NONE);
- uiItemL(row, NULL, ICON_RIGHTARROW);
- uiItemR(row, &ptr, "layers_uv_select_dst", 0, "", ICON_NONE);
- uiItemR(col, &ptr, "islands_precision", 0, "", ICON_NONE);
- }
+}
+
+static void face_corner_vcol_panel_draw(const bContext *C, Panel *panel)
+{
+ uiLayout *layout = panel->layout;
+
+ PointerRNA ptr;
+ modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+
+ uiLayoutSetPropSep(layout, true);
+
+ uiLayoutSetActive(layout, RNA_enum_get(&ptr, "data_types_loops") & DT_TYPE_VCOL);
+
+ uiItemR(layout, &ptr, "layers_vcol_select_src", 0, IFACE_("Layer Selection"), ICON_NONE);
+ uiItemR(layout, &ptr, "layers_vcol_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE);
+}
+
+static void face_corner_uv_panel_draw(const bContext *C, Panel *panel)
+{
+ uiLayout *layout = panel->layout;
+
+ PointerRNA ptr;
+ modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+
+ uiLayoutSetPropSep(layout, true);
+
+ uiLayoutSetActive(layout, RNA_enum_get(&ptr, "data_types_loops") & DT_TYPE_UV);
+
+ uiItemR(layout, &ptr, "layers_uv_select_src", 0, IFACE_("Layer Selection"), ICON_NONE);
+ uiItemR(layout, &ptr, "layers_uv_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE);
+ uiItemR(layout, &ptr, "islands_precision", 0, NULL, ICON_NONE);
}
static void face_panel_draw_header(const bContext *C, Panel *panel)
@@ -421,17 +424,16 @@ static void face_panel_draw(const bContext *C, Panel *panel)
{
uiLayout *layout = panel->layout;
- uiLayout *row;
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
+ uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_poly_data"));
+
+ uiItemR(layout, &ptr, "data_types_polys", 0, NULL, ICON_NONE);
+
uiLayoutSetPropSep(layout, true);
- bool use_poly_data = RNA_boolean_get(&ptr, "use_poly_data");
- uiLayoutSetActive(layout, use_poly_data);
uiItemR(layout, &ptr, "poly_mapping", 0, IFACE_("Mapping"), ICON_NONE);
- row = uiLayoutRow(layout, false);
- uiItemR(ro
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list