1 files changed, 26 insertions, 27 deletions

diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index 23146fcfc5d..0192c3aa398 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -68,7 +68,6 @@
 #include <opensubdiv/far/stencilTable.h>
 
 #include "opensubdiv_intern.h"
-#include "opensubdiv_partitioned.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -80,22 +79,22 @@ using OpenSubdiv::Osd::MeshBitset;
 using OpenSubdiv::Far::StencilTable;
 using OpenSubdiv::Osd::GLPatchTable;
 
-using OpenSubdiv::Osd::PartitionedMesh;
+using OpenSubdiv::Osd::Mesh;
 
 /* CPU backend */
 using OpenSubdiv::Osd::CpuGLVertexBuffer;
 using OpenSubdiv::Osd::CpuEvaluator;
-typedef PartitionedMesh<CpuGLVertexBuffer,
-                        StencilTable,
-                        CpuEvaluator,
-                        GLPatchTable> OsdCpuMesh;
+typedef Mesh<CpuGLVertexBuffer,
+             StencilTable,
+             CpuEvaluator,
+             GLPatchTable> OsdCpuMesh;
 
 #ifdef OPENSUBDIV_HAS_OPENMP
 using OpenSubdiv::Osd::OmpEvaluator;
-typedef PartitionedMesh<CpuGLVertexBuffer,
-                        StencilTable,
-                        OmpEvaluator,
-                        GLPatchTable> OsdOmpMesh;
+typedef Mesh<CpuGLVertexBuffer,
+             StencilTable,
+             OmpEvaluator,
+             GLPatchTable> OsdOmpMesh;
 #endif  /* OPENSUBDIV_HAS_OPENMP */
 
 #ifdef OPENSUBDIV_HAS_OPENCL
@@ -103,11 +102,11 @@ using OpenSubdiv::Osd::CLEvaluator;
 using OpenSubdiv::Osd::CLGLVertexBuffer;
 using OpenSubdiv::Osd::CLStencilTable;
 /* TODO(sergey): Use CLDeviceCOntext similar to OSD examples? */
-typedef PartitionedMesh<CLGLVertexBuffer,
-                        CLStencilTable,
-                        CLEvaluator,
-                        GLPatchTable,
-                        CLDeviceContext> OsdCLMesh;
+typedef Mesh<CLGLVertexBuffer,
+             CLStencilTable,
+             CLEvaluator,
+             GLPatchTable,
+             CLDeviceContext> OsdCLMesh;
 static CLDeviceContext g_clDeviceContext;
 #endif  /* OPENSUBDIV_HAS_OPENCL */
 
@@ -115,10 +114,10 @@ static CLDeviceContext g_clDeviceContext;
 using OpenSubdiv::Osd::CudaEvaluator;
 using OpenSubdiv::Osd::CudaGLVertexBuffer;
 using OpenSubdiv::Osd::CudaStencilTable;
-typedef PartitionedMesh<CudaGLVertexBuffer,
-                        CudaStencilTable,
-                        CudaEvaluator,
-                        GLPatchTable> OsdCudaMesh;
+typedef Mesh<CudaGLVertexBuffer,
+             CudaStencilTable,
+             CudaEvaluator,
+             GLPatchTable> OsdCudaMesh;
 static CudaDeviceContext g_cudaDeviceContext;
 #endif  /* OPENSUBDIV_HAS_CUDA */
 
@@ -126,20 +125,20 @@ static CudaDeviceContext g_cudaDeviceContext;
 using OpenSubdiv::Osd::GLXFBEvaluator;
 using OpenSubdiv::Osd::GLStencilTableTBO;
 using OpenSubdiv::Osd::GLVertexBuffer;
-typedef PartitionedMesh<GLVertexBuffer,
-                        GLStencilTableTBO,
-                        GLXFBEvaluator,
-                        GLPatchTable> OsdGLSLTransformFeedbackMesh;
+typedef Mesh<GLVertexBuffer,
+             GLStencilTableTBO,
+             GLXFBEvaluator,
+             GLPatchTable> OsdGLSLTransformFeedbackMesh;
 #endif  /* OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK */
 
 #ifdef OPENSUBDIV_HAS_GLSL_COMPUTE
 using OpenSubdiv::Osd::GLComputeEvaluator;
 using OpenSubdiv::Osd::GLStencilTableSSBO;
 using OpenSubdiv::Osd::GLVertexBuffer;
-typedef PartitionedMesh<GLVertexBuffer,
-                        GLStencilTableSSBO,
-                        GLComputeEvaluator,
-                        GLPatchTable> OsdGLSLComputeMesh;
+typedef Mesh<GLVertexBuffer,
+             GLStencilTableSSBO,
+             GLComputeEvaluator,
+             GLPatchTable> OsdGLSLComputeMesh;
 #endif
 
 struct OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromTopologyRefiner(