[Bf-blender-cvs] [9e82e48937c] master: Fix T64804 crash editing image paint fallof in edit mode

Brecht Van Lommel noreply at git.blender.org
Tue May 21 16:53:34 CEST 2019


Commit: 9e82e48937cc1620d79fb7b75f0bd826b7f7d84f
Author: Brecht Van Lommel
Date:   Tue May 21 16:31:42 2019 +0200
Branches: master
https://developer.blender.org/rB9e82e48937cc1620d79fb7b75f0bd826b7f7d84f

Fix T64804 crash editing image paint fallof in edit mode

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

M	source/blender/blenkernel/intern/paint.c

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

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index bd06e2fe7e0..5849d691b03 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -102,8 +102,11 @@ void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *view_layer, const
 void BKE_paint_invalidate_cursor_overlay(Scene *scene, ViewLayer *view_layer, CurveMapping *curve)
 {
   Paint *p = BKE_paint_get_active(scene, view_layer);
-  Brush *br = p->brush;
+  if (p == NULL) {
+    return;
+  }
 
+  Brush *br = p->brush;
   if (br && br->curve == curve) {
     overlay_flags |= PAINT_OVERLAY_INVALID_CURVE;
   }



More information about the Bf-blender-cvs mailing list