Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-10-18 15:17:45 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-10-21 14:14:26 +0400
commite8fd23b602d5f46aa47b4427710a78a053df2ad6 (patch)
tree8a3eaf9f62aa15b9da169b301b4675949810a76b
parent387dd2da8e12bb405c0b9b1ae9031923acbb8a45 (diff)
Fix T42281, crash in subsurf with texture painting.
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 2e96eecebcf..8c756c7b1bd 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;
}