[Bf-blender-cvs] [41b99e4] master: b5287b1 removed important CCG_key_top_level call
Campbell Barton
noreply at git.blender.org
Wed Sep 2 07:48:55 CEST 2015
Commit: 41b99e40c0424b6821e35154a404205f7ffa04ce
Author: Campbell Barton
Date: Wed Sep 2 15:39:17 2015 +1000
Branches: master
https://developer.blender.org/rB41b99e40c0424b6821e35154a404205f7ffa04ce
b5287b1 removed important CCG_key_top_level call
Caused subsurf to crash w/o OSD
===================================================================
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 9f83318..2e46281 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1912,6 +1912,8 @@ static void ccgDM_buffer_copy_normal(
int shademodel;
int start = 0;
+ CCG_key_top_level(&key, ss);
+
for (i = 0; i < totface; i++) {
CCGFace *f = ccgdm->faceMap[i].face;
int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);
@@ -2114,6 +2116,8 @@ static void ccgDM_buffer_copy_vertex(
int start = 0;
int edgeSize = ccgSubSurf_getEdgeSize(ss);
+ CCG_key_top_level(&key, ss);
+
for (i = 0; i < totface; i++) {
CCGFace *f = ccgdm->faceMap[i].face;
int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);
More information about the Bf-blender-cvs
mailing list