From 8245805ce3dd23386d7a478ae2f4cfba3b503334 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 19 Apr 2021 23:43:55 +1000 Subject: 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 --- source/blender/editors/io/io_alembic.c | 8 +++++--- source/blender/editors/io/io_collada.c | 10 ++++++---- source/blender/editors/io/io_gpencil_export.c | 10 ++++++---- source/blender/editors/io/io_gpencil_import.c | 5 +++-- 4 files changed, 20 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/io') diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c index a66f53ea839..1f1165a464b 100644 --- a/source/blender/editors/io/io_alembic.c +++ b/source/blender/editors/io/io_alembic.c @@ -240,9 +240,10 @@ static void ui_alembic_export_settings(uiLayout *layout, PointerRNA *imfptr) static void wm_alembic_export_draw(bContext *C, wmOperator *op) { + 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); /* Conveniently set start and end frame to match the scene's frame range. */ Scene *scene = CTX_data_scene(C); @@ -593,11 +594,12 @@ static void ui_alembic_import_settings(uiLayout *layout, PointerRNA *imfptr) uiItemR(col, imfptr, "validate_meshes", 0, NULL, ICON_NONE); } -static void wm_alembic_import_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_alembic_import_draw(bContext *C, wmOperator *op) { + 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); ui_alembic_import_settings(op->layout, &ptr); } diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 2bf975cc4f5..c8e3e1814fc 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -400,11 +400,12 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) } } -static void wm_collada_export_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_collada_export_draw(bContext *C, wmOperator *op) { + 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); uiCollada_exportSettings(op->layout, &ptr); } @@ -797,11 +798,12 @@ static void uiCollada_importSettings(uiLayout *layout, PointerRNA *imfptr) uiItemR(box, imfptr, "keep_bind_info", 0, NULL, ICON_NONE); } -static void wm_collada_import_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_collada_import_draw(bContext *C, wmOperator *op) { + 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); uiCollada_importSettings(op->layout, &ptr); } diff --git a/source/blender/editors/io/io_gpencil_export.c b/source/blender/editors/io/io_gpencil_export.c index 10e4e598bad..7b4b59902f9 100644 --- a/source/blender/editors/io/io_gpencil_export.c +++ b/source/blender/editors/io/io_gpencil_export.c @@ -215,11 +215,12 @@ static void ui_gpencil_export_svg_settings(uiLayout *layout, PointerRNA *imfptr) uiItemR(col, imfptr, "use_clip_camera", 0, NULL, ICON_NONE); } -static void wm_gpencil_export_svg_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_gpencil_export_svg_draw(bContext *C, wmOperator *op) { + 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); ui_gpencil_export_svg_settings(op->layout, &ptr); } @@ -377,11 +378,12 @@ static void ui_gpencil_export_pdf_settings(uiLayout *layout, PointerRNA *imfptr) uiItemR(sub, imfptr, "use_normalized_thickness", 0, NULL, ICON_NONE); } -static void wm_gpencil_export_pdf_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_gpencil_export_pdf_draw(bContext *C, wmOperator *op) { + 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); ui_gpencil_export_pdf_settings(op->layout, &ptr); } diff --git a/source/blender/editors/io/io_gpencil_import.c b/source/blender/editors/io/io_gpencil_import.c index 9768da85940..e4fabc0c5de 100644 --- a/source/blender/editors/io/io_gpencil_import.c +++ b/source/blender/editors/io/io_gpencil_import.c @@ -136,10 +136,11 @@ static void ui_gpencil_import_svg_settings(uiLayout *layout, PointerRNA *imfptr) uiItemR(col, imfptr, "scale", 0, NULL, ICON_NONE); } -static void wm_gpencil_import_svg_draw(bContext *UNUSED(C), wmOperator *op) +static void wm_gpencil_import_svg_draw(bContext *C, wmOperator *op) { + 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); ui_gpencil_import_svg_settings(op->layout, &ptr); } -- cgit v1.2.3