diff options
| author | Julian Eisel <julian@blender.org> | 2021-11-23 20:32:23 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-11-23 20:34:51 +0300 |
| commit | 792badcfefcb92aadc16346f0dc11299a8da0ced (patch) | |
| tree | 14feae7d3b2706d9a912273d804c355b66f06829 /source/blender/gpencil_modifiers | |
| parent | fb4851fbbc37eaea8b46fb8d237674555f9337a0 (diff) | |
Fix broken handling of constraints reordering with library overrides
Alternative to D13291 (description partially copied from there).
New drag & drop reordering code would call constraints reordering
operator with the generic context, and not the one from the panel's
layout. missing the "constraint" member which is mandatory for poll
function to properly deal with override vs. local constraints.
For this to work in a decent way, there needs to be some panel-wide
context that we can restore when executing callbacks outside of the
normal draw context. So similar to uiLayoutSetContextPointer() to set
context on a layout level, this introduces
UI_panel_context_pointer_set() for panel level context (this calls the
former for the current panel root layout as well).
Differential Revision: https://developer.blender.org/D13308
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"); |