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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-03 20:47:06 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-03 20:47:40 +0300
commitc2dc6aa9461046787b605c0c9620e98e1e737384 (patch)
tree429492b8351aa8b71c668b444cd8f36e119a4964 /source/blender/blenkernel/intern/subsurf_ccg.c
parent9b51a9e885a84789700060289cb4ed70b5e0223f (diff)
OpenSubdiv: Smooth shading became broken in recent commit
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 019c3e58aa7..f6337d6ed60 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);