From 72e249974aa7f6a3bd6d5c35c5d5e59cd1c3bded Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 22 Jul 2022 12:25:10 +1000 Subject: [PATCH] Fix crash loading factory settings in image paint mode Loading factory settings left the region NULL, causing the brushes poll function to crash. --- source/blender/editors/sculpt_paint/paint_image.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 56cd4751881..6ed43fe6403 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -276,10 +276,11 @@ static bool image_paint_poll_ex(bContext *C, bool check_tool) (ID_IS_LINKED(sima->image) || ID_IS_OVERRIDE_LIBRARY(sima->image))) { return false; } - ARegion *region = CTX_wm_region(C); - - if ((sima->mode == SI_MODE_PAINT) && region->regiontype == RGN_TYPE_WINDOW) { - return true; + if (sima->mode == SI_MODE_PAINT) { + const ARegion *region = CTX_wm_region(C); + if (region->regiontype == RGN_TYPE_WINDOW) { + return true; + } } } }