diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2022-11-10 21:59:47 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2022-11-10 21:59:47 +0300 |
commit | 366796bbbe71c246ad436da07a721f2a8deafe5c (patch) | |
tree | a4388ece2fc8d036af4635a2729000216f3f4e00 | |
parent | 969aa7bbfcdc06e9998160bdcd18981aaffc833a (diff) | |
parent | cad11f3098c0a2165a80f168a5ce0034f4bbdffc (diff) |
Merge branch 'blender-v3.4-release'
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c index 455d8b0b528..dff8d14564a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloutline.c @@ -287,7 +287,7 @@ static void updateDepsgraph(GpencilModifierData *md, DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Outline Modifier"); } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext *C, Panel *panel) { uiLayout *layout = panel->layout; @@ -302,6 +302,11 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "outline_material", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE); + Scene *scene = CTX_data_scene(C); + if (scene->camera == NULL) { + uiItemL(layout, IFACE_("Outline requires an active camera"), ICON_ERROR); + } + gpencil_modifier_panel_end(layout, ptr); } |