[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30474] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/paint_stroke.c: * fixed crash when there is no active brush

Jason Wilkins Jason.A.Wilkins at gmail.com
Sun Jul 18 22:20:32 CEST 2010


Revision: 30474
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30474
Author:   jwilkins
Date:     2010-07-18 22:20:32 +0200 (Sun, 18 Jul 2010)

Log Message:
-----------
* fixed crash when there is no active brush

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-18 19:56:23 UTC (rev 30473)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-18 20:20:32 UTC (rev 30474)
@@ -420,13 +420,16 @@
 	return 1;
 }
 
-void ED_paint_draw_overlay(const bContext* C, ARegion *ar)
+void ED_draw_paint_overlay(const bContext* C, ARegion *ar)
 {
 	Paint  *paint = paint_get_active(CTX_data_scene(C));
 	Brush  *brush = paint_brush(paint);
 	Sculpt *sd    = CTX_data_tool_settings(C)->sculpt;
 
-	if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_TILED && (brush->flag & BRUSH_TEXTURE_OVERLAY)) {
+	if (brush &&
+		brush->mtex.brush_map_mode == MTEX_MAP_MODE_TILED &&
+		brush->flag & BRUSH_TEXTURE_OVERLAY)
+	{
 		glPushAttrib(
 			GL_COLOR_BUFFER_BIT|
 			GL_CURRENT_BIT|





More information about the Bf-blender-cvs mailing list