diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-04-19 16:43:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-19 16:52:59 +0300 |
commit | 8245805ce3dd23386d7a478ae2f4cfba3b503334 (patch) | |
tree | 1c6b69980d78fa5bfe12713bbee5e73ed697cf6f /source/blender/editors/mesh/editmesh_tools.c | |
parent | 33f218fa3f93a3d574d81d65628188921d6f100c (diff) |
Fix creating operator properties without an owner_id
Any dynamic enum access would not use the callback.
Always set the owner_id to avoid this causing problems.
Oversight in 919558854d624f5db40acfa9f5674ac8c94873b6
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 56d971ea59b..33e4691bfb5 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3694,12 +3694,13 @@ static const EnumPropertyItem *shape_itemf(bContext *C, static void edbm_blend_from_shape_ui(bContext *C, wmOperator *op) { uiLayout *layout = op->layout; + wmWindowManager *wm = CTX_wm_manager(C); PointerRNA ptr; Object *obedit = CTX_data_edit_object(C); Mesh *me = obedit->data; PointerRNA ptr_key; - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); + RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); RNA_id_pointer_create((ID *)me->key, &ptr_key); uiLayoutSetPropSep(layout, true); @@ -5611,12 +5612,13 @@ static bool edbm_decimate_check(bContext *UNUSED(C), wmOperator *UNUSED(op)) return true; } -static void edbm_decimate_ui(bContext *UNUSED(C), wmOperator *op) +static void edbm_decimate_ui(bContext *C, wmOperator *op) { uiLayout *layout = op->layout, *row, *col, *sub; + wmWindowManager *wm = CTX_wm_manager(C); PointerRNA ptr; - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); + RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); uiLayoutSetPropSep(layout, true); |