diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-16 13:36:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-30 17:15:55 +0300 |
| commit | d3c87876c9bcfc6d41af196331824f4760bae361 (patch) | |
| tree | 04e40b8aa83e7c953efa1e78c8c2088c7e774891 /intern/opensubdiv | |
| parent | 5843827fb9ff4338de78ada25ed4d71fe0f32b4a (diff) | |
OpenSubdiv: Cleanup, remove old compatibility code
Consider that all builders have face-varying evaluation now.
Diffstat (limited to 'intern/opensubdiv')
| -rw-r--r-- | intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc index 86271da59bc..0777dab24e6 100644 --- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc @@ -54,13 +54,6 @@ using OpenSubdiv::Osd::CpuPatchTable; using OpenSubdiv::Osd::CpuVertexBuffer; using OpenSubdiv::Osd::PatchCoord; -// TODO(sergey): Remove after official requirement bump for OSD version. -#if OPENSUBDIV_VERSION_NUMBER >= 30200 -# define OPENSUBDIV_HAS_FVAR_EVALUATION -#else -# undef OPENSUBDIV_HAS_FVAR_EVALUATION -#endif - namespace opensubdiv_capi { namespace { @@ -693,7 +686,6 @@ OpenSubdiv_EvaluatorInternal *openSubdiv_createEvaluatorInternal( } // Face warying stencil. vector<const StencilTable *> all_face_varying_stencils; -#ifdef OPENSUBDIV_HAS_FVAR_EVALUATION all_face_varying_stencils.reserve(num_face_varying_channels); for (int face_varying_channel = 0; face_varying_channel < num_face_varying_channels; ++face_varying_channel) { @@ -705,7 +697,6 @@ OpenSubdiv_EvaluatorInternal *openSubdiv_createEvaluatorInternal( all_face_varying_stencils.push_back( StencilTableFactory::Create(*refiner, face_varying_stencil_options)); } -#endif // Generate bi-cubic patch table for the limit surface. // TODO(sergey): Ideally we would want to expose end-cap settings via // C-API to make it more generic. Currently it matches old Blender's @@ -736,7 +727,6 @@ OpenSubdiv_EvaluatorInternal *openSubdiv_createEvaluatorInternal( varying_stencils = table; } } -#ifdef OPENSUBDIV_HAS_FVAR_EVALUATION for (int face_varying_channel = 0; face_varying_channel < num_face_varying_channels; ++face_varying_channel) { const StencilTable *table = StencilTableFactory::AppendLocalPointStencilTableFaceVarying( @@ -749,7 +739,6 @@ OpenSubdiv_EvaluatorInternal *openSubdiv_createEvaluatorInternal( all_face_varying_stencils[face_varying_channel] = table; } } -#endif // Create OpenSubdiv's CPU side evaluator. // TODO(sergey): Make it possible to use different evaluators. opensubdiv_capi::CpuEvalOutput *eval_output = new opensubdiv_capi::CpuEvalOutput( |