[Bf-blender-cvs] [679cc09] opensubdiv-modifier: OpenSubdiv: Remove deprecated functions

Sergey Sharybin noreply at git.blender.org
Sat Jul 11 20:01:52 CEST 2015


Commit: 679cc098b4068442f81a1baeda1f5650b4c87db4
Author: Sergey Sharybin
Date:   Thu Jul 9 16:31:44 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB679cc098b4068442f81a1baeda1f5650b4c87db4

OpenSubdiv: Remove deprecated functions

Were leftovers from legacy osdutil library, will be re-implemented
differently with the new API.

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

M	intern/opensubdiv/opensubdiv_capi.cc
M	intern/opensubdiv/opensubdiv_capi.h
M	source/blender/blenkernel/intern/CCGSubSurf.c

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

diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index c4f9d73..db6af86 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -210,57 +210,6 @@ static void get_partition_per_face(OsdHbrMesh &hmesh,
 }
 #endif
 
-/* TODO(sergey): It might be good to have in evaluator_capi. */
-void openSubdiv_evlauatorClearTags(OpenSubdiv_EvaluatorDescr *evaluator_descr)
-{
-#if 0
-	OsdUtilSubdivTopology *topology =
-	    (OsdUtilSubdivTopology *)openSubdiv_getEvaluatorTopologyDescr(
-	        evaluator_descr);
-
-	topology->tagData.tags.clear();
-	topology->tagData.intArgs.clear();
-	topology->tagData.floatArgs.clear();
-	topology->tagData.stringArgs.clear();
-#else
-	(void)evaluator_descr;
-#endif
-}
-
-void openSubdiv_evaluatorSetEdgeSharpness(
-        OpenSubdiv_EvaluatorDescr *evaluator_descr,
-        int v0, int v1,
-        float sharpness)
-{
-#if 0
-	OsdUtilSubdivTopology *topology =
-	    (OsdUtilSubdivTopology *)openSubdiv_getEvaluatorTopologyDescr(
-	        evaluator_descr);
-	int indices[] = {v0, v1};
-
-	topology->tagData.AddCrease(indices, 2, &sharpness, 1);
-#else
-	(void)evaluator_descr;
-	(void)v0;
-	(void)v1;
-	(void)sharpness;
-#endif
-}
-
-const float *openSubdiv_evaluatorGetFloatTagArgs(
-        OpenSubdiv_EvaluatorDescr *evaluator_descr)
-{
-#if 0
-	OsdUtilSubdivTopology *topology =
-	    (OsdUtilSubdivTopology *)openSubdiv_getEvaluatorTopologyDescr(
-	        evaluator_descr);
-	return &topology->tagData.floatArgs[0];
-#else
-	(void)evaluator_descr;
-	return NULL;
-#endif
-}
-
 struct OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromEvaluator(
         //OpenSubdiv_EvaluatorDescr * /*evaluator_descr*/,
         DerivedMesh *dm,
diff --git a/intern/opensubdiv/opensubdiv_capi.h b/intern/opensubdiv/opensubdiv_capi.h
index 6ca9856..7e94156 100644
--- a/intern/opensubdiv/opensubdiv_capi.h
+++ b/intern/opensubdiv/opensubdiv_capi.h
@@ -63,17 +63,6 @@ enum {
 	OPENSUBDIV_SCHEME_LOOP,
 };
 
-void openSubdiv_evlauatorClearTags(
-    OpenSubdiv_EvaluatorDescr *evaluator_descr);
-
-void openSubdiv_evaluatorSetEdgeSharpness(
-    OpenSubdiv_EvaluatorDescr *evaluator_descr,
-    int v0, int v1,
-    float sharpness);
-
-const float *openSubdiv_evaluatorGetFloatTagArgs(
-    OpenSubdiv_EvaluatorDescr *evaluator_descr);
-
 struct DerivedMesh;
 OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromEvaluator(
     //OpenSubdiv_EvaluatorDescr *evaluator_descr,
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c
index e9e02ce..080c984 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf.c
@@ -2495,6 +2495,7 @@ BLI_INLINE void ccgSubSurf__mapEdgeToFace(int S,
 	}
 }
 
+#if 0
 static void opensubdiv_initEvaluatorFace(CCGSubSurf *ss,
                                          CCGFace *face)
 {
@@ -2535,6 +2536,7 @@ static void opensubdiv_initEvaluatorFace(CCGSubSurf *ss,
 	}
 #undef MAX_STATIC_VERTS
 }
+#endif
 
 static bool opensubdiv_initEvaluator(CCGSubSurf *ss)
 {
@@ -2654,8 +2656,8 @@ static bool check_topology_changed(CCGSubSurf *ss)
 	    num_nverts;
 	int *indices, *nverts;
 	int i, index, osd_face_index;
-	const float *float_args =
-	        openSubdiv_evaluatorGetFloatTagArgs(ss->osd_evaluator);
+	const float *float_args = NULL;
+	/*        openSubdiv_evaluatorGetFloatTagArgs(ss->osd_evaluator); */
 
 	/* If compute type changes, need to re-create GL Mesh.
 	 * For now let's do evaluator as well, will optimize




More information about the Bf-blender-cvs mailing list