diff options
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv_converter.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv_converter.c | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_converter.c b/source/blender/blenkernel/intern/subdiv_converter.c index 7c9410fba72..d5c75503500 100644 --- a/source/blender/blenkernel/intern/subdiv_converter.c +++ b/source/blender/blenkernel/intern/subdiv_converter.c @@ -29,43 +29,42 @@ void BKE_subdiv_converter_free(struct OpenSubdiv_Converter *converter) { - if (converter->freeUserData) { - converter->freeUserData(converter); - } + if (converter->freeUserData) { + converter->freeUserData(converter); + } } -int BKE_subdiv_converter_vtx_boundary_interpolation_from_settings( - const SubdivSettings *settings) +int BKE_subdiv_converter_vtx_boundary_interpolation_from_settings(const SubdivSettings *settings) { - switch (settings->vtx_boundary_interpolation) { - case SUBDIV_VTX_BOUNDARY_NONE: - return OSD_VTX_BOUNDARY_NONE; - case SUBDIV_VTX_BOUNDARY_EDGE_ONLY: - return OSD_VTX_BOUNDARY_EDGE_ONLY; - case SUBDIV_VTX_BOUNDARY_EDGE_AND_CORNER: - return OSD_VTX_BOUNDARY_EDGE_AND_CORNER; - } - BLI_assert(!"Unknown vtx boundary interpolation"); - return OSD_VTX_BOUNDARY_EDGE_ONLY; + switch (settings->vtx_boundary_interpolation) { + case SUBDIV_VTX_BOUNDARY_NONE: + return OSD_VTX_BOUNDARY_NONE; + case SUBDIV_VTX_BOUNDARY_EDGE_ONLY: + return OSD_VTX_BOUNDARY_EDGE_ONLY; + case SUBDIV_VTX_BOUNDARY_EDGE_AND_CORNER: + return OSD_VTX_BOUNDARY_EDGE_AND_CORNER; + } + BLI_assert(!"Unknown vtx boundary interpolation"); + return OSD_VTX_BOUNDARY_EDGE_ONLY; } -/*OpenSubdiv_FVarLinearInterpolation*/ int -BKE_subdiv_converter_fvar_linear_from_settings(const SubdivSettings *settings) +/*OpenSubdiv_FVarLinearInterpolation*/ int BKE_subdiv_converter_fvar_linear_from_settings( + const SubdivSettings *settings) { - switch (settings->fvar_linear_interpolation) { - case SUBDIV_FVAR_LINEAR_INTERPOLATION_NONE: - return OSD_FVAR_LINEAR_INTERPOLATION_NONE; - case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_ONLY: - return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_ONLY; - case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_AND_JUNCTIONS: - return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_PLUS1; - case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_JUNCTIONS_AND_CONCAVE: - return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_PLUS2; - case SUBDIV_FVAR_LINEAR_INTERPOLATION_BOUNDARIES: - return OSD_FVAR_LINEAR_INTERPOLATION_BOUNDARIES; - case SUBDIV_FVAR_LINEAR_INTERPOLATION_ALL: - return OSD_FVAR_LINEAR_INTERPOLATION_ALL; - } - BLI_assert(!"Unknown fvar linear interpolation"); - return OSD_FVAR_LINEAR_INTERPOLATION_NONE; + switch (settings->fvar_linear_interpolation) { + case SUBDIV_FVAR_LINEAR_INTERPOLATION_NONE: + return OSD_FVAR_LINEAR_INTERPOLATION_NONE; + case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_ONLY: + return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_ONLY; + case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_AND_JUNCTIONS: + return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_PLUS1; + case SUBDIV_FVAR_LINEAR_INTERPOLATION_CORNERS_JUNCTIONS_AND_CONCAVE: + return OSD_FVAR_LINEAR_INTERPOLATION_CORNERS_PLUS2; + case SUBDIV_FVAR_LINEAR_INTERPOLATION_BOUNDARIES: + return OSD_FVAR_LINEAR_INTERPOLATION_BOUNDARIES; + case SUBDIV_FVAR_LINEAR_INTERPOLATION_ALL: + return OSD_FVAR_LINEAR_INTERPOLATION_ALL; + } + BLI_assert(!"Unknown fvar linear interpolation"); + return OSD_FVAR_LINEAR_INTERPOLATION_NONE; } |