diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_datatransfer.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_datatransfer.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index fa50403d91a..a3b088799cc 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -346,6 +346,22 @@ static void face_corner_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "loop_mapping", 0, IFACE_("Mapping"), ICON_NONE); } +static void vert_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL); + + uiLayoutSetPropSep(layout, true); + + uiLayoutSetActive(layout, + RNA_enum_get(ptr, "data_types_verts") & + (DT_TYPE_MPROPCOL_VERT | DT_TYPE_MLOOPCOL_VERT)); + + uiItemR(layout, ptr, "layers_vcol_vert_select_src", 0, IFACE_("Layer Selection"), ICON_NONE); + uiItemR(layout, ptr, "layers_vcol_vert_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE); +} + static void face_corner_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *layout = panel->layout; @@ -354,10 +370,12 @@ static void face_corner_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) uiLayoutSetPropSep(layout, true); - uiLayoutSetActive(layout, RNA_enum_get(ptr, "data_types_loops") & DT_TYPE_VCOL); + uiLayoutSetActive(layout, + RNA_enum_get(ptr, "data_types_loops") & + (DT_TYPE_MPROPCOL_LOOP | DT_TYPE_MLOOPCOL_LOOP)); - 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); + uiItemR(layout, ptr, "layers_vcol_loop_select_src", 0, IFACE_("Layer Selection"), ICON_NONE); + uiItemR(layout, ptr, "layers_vcol_loop_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE); } static void face_corner_uv_panel_draw(const bContext *UNUSED(C), Panel *panel) @@ -427,6 +445,9 @@ static void panelRegister(ARegionType *region_type) region_type, "vertex_vgroup", "Vertex Groups", NULL, vertex_vgroup_panel_draw, vertex_panel); modifier_subpanel_register( + region_type, "vert_vcol", "Colors", NULL, vert_vcol_panel_draw, vertex_panel); + + modifier_subpanel_register( region_type, "edge", "", edge_panel_draw_header, edge_panel_draw, panel_type); PanelType *face_corner_panel = modifier_subpanel_register(region_type, @@ -437,7 +458,7 @@ static void panelRegister(ARegionType *region_type) panel_type); modifier_subpanel_register(region_type, "face_corner_vcol", - "Vertex Colors", + "Colors", NULL, face_corner_vcol_panel_draw, face_corner_panel); |