[Bf-blender-cvs] [e8fd23b] blender-v2.72-release: Fix T42281, crash in subsurf with texture painting.

Antony Riakiotakis noreply at git.blender.org
Tue Oct 21 12:14:44 CEST 2014


Commit: e8fd23b602d5f46aa47b4427710a78a053df2ad6
Author: Antony Riakiotakis
Date:   Sat Oct 18 13:17:45 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rBe8fd23b602d5f46aa47b4427710a78a053df2ad6

Fix T42281, crash in subsurf with texture painting.

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

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

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

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 2e96eec..8c756c7 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2353,8 +2353,9 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
 
 				mat_nr_cache = mat_nr;
 			}
-			tf = tf_base + gridOffset;
-			tf_stencil = tf_stencil_base + gridOffset;
+
+			tf = tf_base ? tf_base + gridOffset : NULL;
+			tf_stencil = tf_stencil_base ? tf_stencil_base + gridOffset : NULL;
 			gridOffset += gridFaces * gridFaces * numVerts;
 		}




More information about the Bf-blender-cvs mailing list