[Bf-blender-cvs] [1006767678e] master: Fix crash opening file saved in editmode with a brush image texture
Philipp Oeser
noreply at git.blender.org
Fri May 3 15:49:10 CEST 2019
Commit: 1006767678eb940c161e538c09b86404f7f1b5ca
Author: Philipp Oeser
Date: Fri May 3 09:55:38 2019 +0200
Branches: master
https://developer.blender.org/rB1006767678eb940c161e538c09b86404f7f1b5ca
Fix crash opening file saved in editmode with a brush image texture
started with recent UV Sculpt tool-system integration rB928becec60d1
Fixes T64094
Reviewers: brecht
Maniphest Tasks: T64094
Differential Revision: https://developer.blender.org/D4788
===================================================================
M source/blender/blenkernel/intern/paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index c55cf18fcea..b594232193d 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -82,8 +82,11 @@ static eOverlayControlFlags overlay_flags = 0;
void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *view_layer, const Tex *tex)
{
Paint *p = BKE_paint_get_active(scene, view_layer);
- Brush *br = p->brush;
+ if (!p) {
+ return;
+ }
+ Brush *br = p->brush;
if (!br) {
return;
}
More information about the Bf-blender-cvs
mailing list