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_intersect.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_intersect.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 0e3cc22d358..141f120396a 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -251,13 +251,14 @@ static int edbm_intersect_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void edbm_intersect_ui(bContext *UNUSED(C), wmOperator *op) +static void edbm_intersect_ui(bContext *C, wmOperator *op) { uiLayout *layout = op->layout; + wmWindowManager *wm = CTX_wm_manager(C); uiLayout *row; PointerRNA ptr; - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); + RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); bool use_exact = RNA_enum_get(&ptr, "solver") == ISECT_SOLVER_EXACT; @@ -417,13 +418,14 @@ static int edbm_intersect_boolean_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void edbm_intersect_boolean_ui(bContext *UNUSED(C), wmOperator *op) +static void edbm_intersect_boolean_ui(bContext *C, wmOperator *op) { uiLayout *layout = op->layout; uiLayout *row; + 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); bool use_exact = RNA_enum_get(&ptr, "solver") == ISECT_SOLVER_EXACT; |