[Bf-blender-cvs] [b38b584] master: Fix T44124: Crash deleting brush

Campbell Barton noreply at git.blender.org
Wed Mar 25 10:17:14 CET 2015


Commit: b38b5846bac2b7674d9130e943df76f5f3626d6c
Author: Campbell Barton
Date:   Wed Mar 25 20:16:27 2015 +1100
Branches: master
https://developer.blender.org/rBb38b5846bac2b7674d9130e943df76f5f3626d6c

Fix T44124: Crash deleting brush

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

M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index a06f6cd..e51993c 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3636,7 +3636,7 @@ static bool is_cursor_visible(Scene *scene)
 		else if (ob->mode & OB_MODE_TEXTURE_PAINT) {
 			const Paint *p = BKE_paint_get_active(scene);
 
-			if (p && p->brush->imagepaint_tool == PAINT_TOOL_CLONE) {
+			if (p && p->brush && p->brush->imagepaint_tool == PAINT_TOOL_CLONE) {
 				if ((scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_LAYER_CLONE) == 0) {
 					return true;
 				}




More information about the Bf-blender-cvs mailing list