Commit: 75ddef83ccd98f91a15e2ed8dcfb925152d37830
Author: Sergey Sharybin
Date: Fri Jul 4 21:25:36 2014 +0600
https://developer.blender.org/rB75ddef83ccd98f91a15e2ed8dcfb925152d37830
OpenSubdiv: CPU-side simple subdivisions now really kind of work
Before this change it was always CC, because of lack of some changes
in the branch.
===================================================================
M source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c
b/source/blender/blenkernel/intern/CCGSubSurf.c
index a99cf13..1b63f10 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf.c
@@ -2507,6 +2507,9 @@ static void opensubdiv_initEvaluatorFace(CCGSubSurf *ss,
static bool opensubdiv_initEvaluator(CCGSubSurf *ss)
{
int i;
+ OsdScheme scheme = ss->meshIFC.simpleSubdiv
+ ? OSD_SCHEME_BILINEAR
+ : OSD_SCHEME_CATMARK;
for (i = 0; i < ss->fMap->curSize; i++) {
CCGFace *face = (CCGFace *) ss->fMap->buckets[i];
@@ -2518,7 +2521,9 @@ static bool opensubdiv_initEvaluator(CCGSubSurf *ss)
/* Do feature adaptive refinement and get ready to update
* coarse points and evaluate.
*/
- return openSubdiv_finishEvaluatorDescr(ss->osd_evaluator,
ss->subdivLevels) != 0;
+ return openSubdiv_finishEvaluatorDescr(ss->osd_evaluator,
+ ss->subdivLevels,
+ scheme) != 0;
}
static bool check_topology_changed(CCGSubSurf *ss)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
