diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_multires.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_multires.c | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 9ced297bb48..7bdc1da33c2 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -333,39 +333,37 @@ static void panel_draw(const bContext *C, Panel *panel) uiLayout *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL); uiLayoutSetPropSep(layout, true); col = uiLayoutColumn(layout, true); - uiItemR(col, &ptr, "levels", 0, IFACE_("Level Viewport"), ICON_NONE); - uiItemR(col, &ptr, "sculpt_levels", 0, IFACE_("Sculpt"), ICON_NONE); - uiItemR(col, &ptr, "render_levels", 0, IFACE_("Render"), ICON_NONE); + uiItemR(col, ptr, "levels", 0, IFACE_("Level Viewport"), ICON_NONE); + uiItemR(col, ptr, "sculpt_levels", 0, IFACE_("Sculpt"), ICON_NONE); + uiItemR(col, ptr, "render_levels", 0, IFACE_("Render"), ICON_NONE); const bool is_sculpt_mode = CTX_data_active_object(C)->mode & OB_MODE_SCULPT; uiBlock *block = uiLayoutGetBlock(panel->layout); UI_block_lock_set(block, !is_sculpt_mode, IFACE_("Sculpt Base Mesh")); - uiItemR(col, &ptr, "use_sculpt_base_mesh", 0, IFACE_("Sculpt Base Mesh"), ICON_NONE); + uiItemR(col, ptr, "use_sculpt_base_mesh", 0, IFACE_("Sculpt Base Mesh"), ICON_NONE); UI_block_lock_clear(block); - uiItemR(layout, &ptr, "show_only_control_edges", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "show_only_control_edges", 0, NULL, ICON_NONE); - modifier_panel_end(layout, &ptr); + modifier_panel_end(layout, ptr); } -static void subdivisions_panel_draw(const bContext *C, Panel *panel) +static void subdivisions_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; - PointerRNA ptr; PointerRNA ob_ptr; - modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr); uiLayoutSetEnabled(layout, RNA_enum_get(&ob_ptr, "mode") != OB_MODE_EDIT); - MultiresModifierData *mmd = (MultiresModifierData *)ptr.data; + MultiresModifierData *mmd = (MultiresModifierData *)ptr->data; /** * Changing some of the properties can not be done once there is an @@ -418,14 +416,13 @@ static void subdivisions_panel_draw(const bContext *C, Panel *panel) uiItemO(layout, IFACE_("Delete Higher"), ICON_NONE, "OBJECT_OT_multires_higher_levels_delete"); } -static void shape_panel_draw(const bContext *C, Panel *panel) +static void shape_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; - PointerRNA ptr; PointerRNA ob_ptr; - modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + modifier_panel_get_property_pointers(panel, &ob_ptr); uiLayoutSetEnabled(layout, RNA_enum_get(&ob_ptr, "mode") != OB_MODE_EDIT); @@ -434,16 +431,15 @@ static void shape_panel_draw(const bContext *C, Panel *panel) uiItemO(row, IFACE_("Apply Base"), ICON_NONE, "OBJECT_OT_multires_base_apply"); } -static void generate_panel_draw(const bContext *C, Panel *panel) +static void generate_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col, *row; uiLayout *layout = panel->layout; - PointerRNA ptr; - modifier_panel_get_property_pointers(C, panel, NULL, &ptr); - MultiresModifierData *mmd = (MultiresModifierData *)ptr.data; + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL); + MultiresModifierData *mmd = (MultiresModifierData *)ptr->data; - bool is_external = RNA_boolean_get(&ptr, "is_external"); + bool is_external = RNA_boolean_get(ptr, "is_external"); if (mmd->totlvl == 0) { uiItemO( @@ -456,36 +452,35 @@ static void generate_panel_draw(const bContext *C, Panel *panel) uiItemO(row, IFACE_("Pack External"), ICON_NONE, "OBJECT_OT_multires_external_pack"); uiLayoutSetPropSep(col, true); row = uiLayoutRow(col, false); - uiItemR(row, &ptr, "filepath", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "filepath", 0, NULL, ICON_NONE); } else { uiItemO(col, IFACE_("Save External..."), ICON_NONE, "OBJECT_OT_multires_external_save"); } } -static void advanced_panel_draw(const bContext *C, Panel *panel) +static void advanced_panel_draw(const bContext *UNUSED(C), Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; - PointerRNA ptr; - modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL); - bool has_displacement = RNA_int_get(&ptr, "total_levels") != 0; + bool has_displacement = RNA_int_get(ptr, "total_levels") != 0; uiLayoutSetPropSep(layout, true); uiLayoutSetEnabled(layout, !has_displacement); - uiItemR(layout, &ptr, "subdivision_type", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "quality", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "subdivision_type", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "quality", 0, NULL, ICON_NONE); col = uiLayoutColumn(layout, false); uiLayoutSetEnabled(col, true); - uiItemR(col, &ptr, "uv_smooth", 0, NULL, ICON_NONE); + uiItemR(col, ptr, "uv_smooth", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "use_creases", 0, NULL, ICON_NONE); - uiItemR(layout, &ptr, "use_custom_normals", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_creases", 0, NULL, ICON_NONE); + uiItemR(layout, ptr, "use_custom_normals", 0, NULL, ICON_NONE); } static void panelRegister(ARegionType *region_type) |