[Bf-blender-cvs] [72e249974aa] master: Fix crash loading factory settings in image paint mode
Campbell Barton
noreply at git.blender.org
Fri Jul 22 04:27:35 CEST 2022
Commit: 72e249974aa7f6a3bd6d5c35c5d5e59cd1c3bded
Author: Campbell Barton
Date: Fri Jul 22 12:25:10 2022 +1000
Branches: master
https://developer.blender.org/rB72e249974aa7f6a3bd6d5c35c5d5e59cd1c3bded
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 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;
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list