[Bf-blender-cvs] [c2dc6aa] master: OpenSubdiv: Smooth shading became broken in recent commit

[Sergey Sharybin]

Commit: c2dc6aa9461046787b605c0c9620e98e1e737384
Author: Sergey Sharybin
Date:   Mon Aug 3 19:47:06 2015 +0200
Branches: master
https://developer.blender.org/rBc2dc6aa9461046787b605c0c9620e98e1e737384

OpenSubdiv: Smooth shading became broken in recent commit

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

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 019c3e5..f6337d6 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -4528,11 +4528,9 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
 }
 
 /* Fill in only geometry arrays needed for the GPU tessellation. */
-static void set_ccgdm_gpu_geometry(CCGDerivedMesh *ccgdm,
-                                   CCGSubSurf *ss,
-                                   DerivedMesh *dm)
+static void set_ccgdm_gpu_geometry(CCGDerivedMesh *ccgdm, DerivedMesh *dm)
 {
-	const int totface = ccgSubSurf_getNumFaces(ss);
+	const int totface = dm->getNumPolys(dm);
 	MPoly *mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
 	int index;
 	DMFlagMat *faceFlags = ccgdm->faceFlags;
@@ -4630,7 +4628,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 		set_ccgdm_all_geometry(ccgdm, ss, dm, useSubsurfUv != 0);
 	}
 	else {
-		set_ccgdm_gpu_geometry(ccgdm, ss, dm);
+		set_ccgdm_gpu_geometry(ccgdm, dm);
 	}
 
 	ccgdm->dm.numVertData = ccgSubSurf_getNumFinalVerts(ss);