[Bf-blender-cvs] [f592c0d] soc-2013-paint: Fix crash when entering texture paint mode in cycles with image editor open.

Antony Riakiotakis noreply at git.blender.org
Sun Jun 1 21:54:13 CEST 2014


Commit: f592c0d73f5aa6d7d6d26bf023e6c01f3a3f8246
Author: Antony Riakiotakis
Date:   Sun Jun 1 22:53:58 2014 +0300
https://developer.blender.org/rBf592c0d73f5aa6d7d6d26bf023e6c01f3a3f8246

Fix crash when entering texture paint mode in cycles with image editor
open.

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

M	source/blender/editors/uvedit/uvedit_draw.c

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

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 2a27c44..e21e0a6 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -411,7 +411,7 @@ static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
 		MPoly *mpoly = me->mpoly;
 		MLoopUV *mloopuv, *mloopuv_base;
 		int a, b;
-		if (!(ma && ma->texpaintslot[ma->paint_active_slot].uvname[0] &&
+		if (!(ma && ma->texpaintslot && ma->texpaintslot[ma->paint_active_slot].uvname[0] &&
 		      (mloopuv = CustomData_get_layer_named(&me->ldata, CD_MLOOPUV, ma->texpaintslot[ma->paint_active_slot].uvname))))
 		{
 			mloopuv = me->mloopuv;




More information about the Bf-blender-cvs mailing list