diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-22 18:52:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-22 18:53:00 +0300 |
| commit | 164575af29f94d8db78265df1520a3f7bfd3c72d (patch) | |
| tree | 19f6137ca254f9c6c37be9f93197673357ed6ae3 /intern/opensubdiv | |
| parent | 7ca4cf2be59f52de4b2a622c358fca1f002806d1 (diff) | |
OpenSubdiv: Properly respect Subdivide UVs option
Diffstat (limited to 'intern/opensubdiv')
| -rw-r--r-- | intern/opensubdiv/opensubdiv_converter.cc | 16 | ||||
| -rw-r--r-- | intern/opensubdiv/opensubdiv_converter_capi.h | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/intern/opensubdiv/opensubdiv_converter.cc b/intern/opensubdiv/opensubdiv_converter.cc index 9b2fb19808c..ea41a56768f 100644 --- a/intern/opensubdiv/opensubdiv_converter.cc +++ b/intern/opensubdiv/opensubdiv_converter.cc @@ -567,9 +567,12 @@ struct OpenSubdiv_TopologyRefinerDescr *openSubdiv_createTopologyRefinerDescr( Options options; options.SetVtxBoundaryInterpolation(Options::VTX_BOUNDARY_EDGE_ONLY); options.SetCreasingMethod(Options::CREASE_UNIFORM); - /* TODO(sergey): Get proper UV subdivide flag. */ - // options.SetFVarLinearInterpolation(Options::FVAR_LINEAR_ALL); - options.SetFVarLinearInterpolation(Options::FVAR_LINEAR_CORNERS_ONLY); + if (converter->get_subdiv_uvs(converter)) { + options.SetFVarLinearInterpolation(Options::FVAR_LINEAR_CORNERS_ONLY); + } + else { + options.SetFVarLinearInterpolation(Options::FVAR_LINEAR_ALL); + } TopologyRefinerFactory<TopologyRefinerData>::Options topology_options(scheme_type, options); @@ -649,6 +652,7 @@ int openSubdiv_topologyRefnerCompareConverter( const OpenSubdiv_TopologyRefinerDescr *topology_refiner, OpenSubdiv_Converter *converter) { + typedef OpenSubdiv::Sdc::Options Options; using OpenSubdiv::Far::ConstIndexArray; using OpenSubdiv::Far::TopologyRefiner; using OpenSubdiv::Far::TopologyLevel; @@ -663,6 +667,12 @@ int openSubdiv_topologyRefnerCompareConverter( if (scheme_type != refiner->GetSchemeType()) { return false; } + const Options options = refiner->GetSchemeOptions(); + Options::FVarLinearInterpolation interp = options.GetFVarLinearInterpolation(); + const bool subdiv_uvs = (interp != Options::FVAR_LINEAR_ALL); + if (converter->get_subdiv_uvs(converter) != subdiv_uvs) { + return false; + } if (converter->get_num_verts(converter) != num_verts || converter->get_num_edges(converter) != num_edges || converter->get_num_faces(converter) != num_faces) diff --git a/intern/opensubdiv/opensubdiv_converter_capi.h b/intern/opensubdiv/opensubdiv_converter_capi.h index 4448f108e8a..6eda6ae5d8a 100644 --- a/intern/opensubdiv/opensubdiv_converter_capi.h +++ b/intern/opensubdiv/opensubdiv_converter_capi.h @@ -47,6 +47,8 @@ typedef struct OpenSubdiv_Converter { OpenSubdiv_SchemeType (*get_type)(const OpenSubdiv_Converter *converter); + bool (*get_subdiv_uvs)(const OpenSubdiv_Converter *converter); + int (*get_num_faces)(const OpenSubdiv_Converter *converter); int (*get_num_edges)(const OpenSubdiv_Converter *converter); int (*get_num_verts)(const OpenSubdiv_Converter *converter); |