[Bf-blender-cvs] [2b83f3d5216] blender-v3.2-release: Fix crash loading factory settings in image paint mode

Campbell Barton noreply at git.blender.org
Tue Jul 26 16:50:47 CEST 2022


Commit: 2b83f3d5216374aa5fca6114dca26c2172dedd2b
Author: Campbell Barton
Date:   Fri Jul 22 12:25:10 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rB2b83f3d5216374aa5fca6114dca26c2172dedd2b

Fix crash loading factory settings in image paint mode

Loading factory settings left the region NULL, causing the brushes
poll function to crash.

===================================================================

M	source/blender/editors/sculpt_paint/paint_image.cc

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc
index e726fd3f338..9c37bbed870 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;
+        }
       }
     }
   }



More information about the Bf-blender-cvs mailing list