[Bf-blender-cvs] [3a961d6] master: Fix T42281, crash in subsurf with texture painting.
Antony Riakiotakis
noreply at git.blender.org
Sat Oct 18 13:18:26 CEST 2014
Commit: 3a961d66ef189f70cfcd16338b4dc14b82d6bb00
Author: Antony Riakiotakis
Date: Sat Oct 18 13:17:45 2014 +0200
Branches: master
https://developer.blender.org/rB3a961d66ef189f70cfcd16338b4dc14b82d6bb00
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 0bd9517..f03e2ea 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2352,8 +2352,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