[Bf-blender-cvs] [77824c4] opensubdiv-modifier: OpenSubdiv: Remove some deprecated arguments from GL Mesh CAPI

[Sergey Sharybin]

Commit: 77824c469609bbcfb226aea1a88af5c2dd86e617
Author: Sergey Sharybin
Date:   Thu Jul 16 13:28:40 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB77824c469609bbcfb226aea1a88af5c2dd86e617

OpenSubdiv: Remove some deprecated arguments from GL Mesh CAPI

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

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

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

diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index b5e7aa7..1d50d32 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -145,8 +145,6 @@ typedef PartitionedMesh<GLVertexBuffer,
 struct OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromTopologyRefiner(
         OpenSubdiv_TopologyRefinerDescr *topology_refiner,
         int evaluator_type,
-        int level,
-        int /*scheme*/,
         int /*subdivide_uvs*/)
 {
 	using OpenSubdiv::Far::TopologyRefiner;
@@ -175,7 +173,7 @@ struct OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromTopologyRefiner(
 			mesh = new class(refiner, \
 			                 num_vertex_elements, \
 			                 num_varying_elements, \
-			                 level, \
+			                 refiner->GetMaxLevel(), \
 			                 bits); \
 			break;
 
diff --git a/intern/opensubdiv/opensubdiv_capi.h b/intern/opensubdiv/opensubdiv_capi.h
index b5c3932..6b65923 100644
--- a/intern/opensubdiv/opensubdiv_capi.h
+++ b/intern/opensubdiv/opensubdiv_capi.h
@@ -66,8 +66,6 @@ enum {
 OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromTopologyRefiner(
     struct OpenSubdiv_TopologyRefinerDescr *topology_refiner,
     int evaluator_type,
-    int level,
-    int scheme,
     int subdivide_uvs);
 
 void openSubdiv_deleteOsdGLMesh(OpenSubdiv_GLMesh *gl_mesh);
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
index cf937a7..4026e05 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
@@ -243,8 +243,6 @@ bool ccgSubSurf_prepareGLMesh(CCGSubSurf *ss, bool use_osd_glsl)
 		ss->osd_mesh = openSubdiv_createOsdGLMeshFromTopologyRefiner(
 		        ss->osd_topology_refiner,
 		        compute_type,
-		        ss->subdivLevels,
-		        OPENSUBDIV_SCHEME_CATMARK,  /* TODO(sergey): Deprecated argument. */
 		        ss->osd_subsurf_uv);
 		ss->osd_topology_refiner = NULL;