[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56089] trunk/blender/source/blender/ blenkernel/intern/paint.c: Fix crash when no brush is active.

[Antony Riakiotakis]

Revision: 56089
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56089
Author:   psy-fi
Date:     2013-04-16 14:00:18 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Fix crash when no brush is active. Reported by Francesco Siddi, on irc
thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/paint.c

Modified: trunk/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/paint.c      2013-04-16 
13:52:38 UTC (rev 56088)
+++ trunk/blender/source/blender/blenkernel/intern/paint.c      2013-04-16 
14:00:18 UTC (rev 56089)
@@ -64,6 +64,9 @@
        Paint *p = BKE_paint_get_active(scene);
        Brush *br = p->brush;
 
+       if (!br)
+               return;
+
        if (br->mtex.tex == tex)
                overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY;
        if (br->mask_mtex.tex == tex)
@@ -75,7 +78,7 @@
        Paint *p = BKE_paint_get_active(scene);
        Brush *br = p->brush;
 
-       if (br->curve == curve)
+       if (br && br->curve == curve)
                overlay_flags |= PAINT_INVALID_OVERLAY_CURVE;
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs