diff options
| author | Julian Eisel <julian@blender.org> | 2021-11-23 20:35:56 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-11-23 20:35:56 +0300 |
| commit | c09e8a35904d5c58882cbe93c5086e5f2450c80e (patch) | |
| tree | be47fdedd56de6129052af7f8918f463ecbf031e /source/blender/gpencil_modifiers | |
| parent | c0a2b2174415af228ecc27659d7cfb5148143a7f (diff) | |
| parent | 792badcfefcb92aadc16346f0dc11299a8da0ced (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/gpencil_modifiers')
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c | 4 | ||||
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencildash.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c index 2e241ea5848..ecadf744871 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c @@ -232,7 +232,7 @@ PointerRNA *gpencil_modifier_panel_get_property_pointers(Panel *panel, PointerRN UI_block_lock_clear(block); UI_block_lock_set(block, ID_IS_LINKED((Object *)ptr->owner_id), ERROR_LIBDATA_MESSAGE); - uiLayoutSetContextPointer(panel->layout, "modifier", ptr); + UI_panel_context_pointer_set(panel, "modifier", ptr); return ptr; } @@ -312,7 +312,7 @@ static void gpencil_modifier_panel_header(const bContext *UNUSED(C), Panel *pane PointerRNA *ptr = UI_panel_custom_data_get(panel); GpencilModifierData *md = (GpencilModifierData *)ptr->data; - uiLayoutSetContextPointer(panel->layout, "modifier", ptr); + UI_panel_context_pointer_set(panel, "modifier", ptr); const GpencilModifierTypeInfo *mti = BKE_gpencil_modifier_get_info(md->type); bool narrow_panel = (panel->sizex < UI_UNIT_X * 9 && panel->sizex != 0); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c index 7d2eb4b2c75..6a4d0de5c80 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c @@ -313,8 +313,6 @@ static void panel_draw(const bContext *C, Panel *panel) UI_TEMPLATE_LIST_FLAG_NONE); uiLayout *col = uiLayoutColumn(row, false); - uiLayoutSetContextPointer(col, "modifier", ptr); - uiLayout *sub = uiLayoutColumn(col, true); uiItemO(sub, "", ICON_ADD, "GPENCIL_OT_segment_add"); uiItemO(sub, "", ICON_REMOVE, "GPENCIL_OT_segment_remove"); |