From fd7c884aef4da16d452c8a3b083766db3250ea6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 12 Aug 2024 17:24:00 +0200 Subject: [PATCH] Fix: Overlay-Next: Crash on scene without active object --- source/blender/draw/engines/overlay/overlay_next_instance.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_next_instance.cc index 0c46beb884a..daf660f6d07 100644 --- a/source/blender/draw/engines/overlay/overlay_next_instance.cc +++ b/source/blender/draw/engines/overlay/overlay_next_instance.cc @@ -371,10 +371,11 @@ bool Instance::object_is_selected(const ObjectRef &ob_ref) bool Instance::object_is_paint_mode(const Object *object) { - if (object->type == OB_GREASE_PENCIL && state.object_mode & OB_MODE_WEIGHT_GPENCIL_LEGACY) { + if (object->type == OB_GREASE_PENCIL && (state.object_mode & OB_MODE_WEIGHT_GPENCIL_LEGACY)) { return true; } - return (object == state.active_base->object) && (state.object_mode & OB_MODE_ALL_PAINT); + return state.active_base && (object == state.active_base->object) && + (state.object_mode & OB_MODE_ALL_PAINT); } bool Instance::object_is_sculpt_mode(const ObjectRef &ob_ref)