Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-05-03 10:55:38 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-05-03 16:44:53 +0300
commit1006767678eb940c161e538c09b86404f7f1b5ca (patch)
tree8d66f1fc9b6bf9e0e42193a07cd82b35c4f2981d /source/blender/blenkernel
parentf437b958c3ffc7bea0e9869e296da2585f2e75fe (diff)
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
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/paint.c5
1 files changed, 4 insertions, 1 deletions
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;
}