[Bf-blender-cvs] [1ca8406] opensubdiv-modifier: OpenSubdiv: Fix compilation error of CCG with disabled OpenSubdiv
Sergey Sharybin
noreply at git.blender.org
Mon Jul 20 12:00:19 CEST 2015
Commit: 1ca8406d3171dc22a40053040a75e3d0fc2adb6b
Author: Sergey Sharybin
Date: Mon Jul 20 11:57:20 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB1ca8406d3171dc22a40053040a75e3d0fc2adb6b
OpenSubdiv: Fix compilation error of CCG with disabled OpenSubdiv
===================================================================
M source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c
index fc6ae9e..9ac6166 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf.c
@@ -507,7 +507,9 @@ CCGError ccgSubSurf_initFullSync(CCGSubSurf *ss)
ss->tempEdges = MEM_mallocN(sizeof(*ss->tempEdges) * ss->lenTempArrays, "CCGSubsurf tempEdges");
ss->syncState = eSyncState_Vert;
+#ifdef WITH_OPENSUBDIV
ss->osd_next_face_ptex_index = 0;
+#endif
return eCCGError_None;
}
More information about the Bf-blender-cvs
mailing list