From 02dbe3b0c78045abb49a32c562933b621f3aa0b1 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 14 Aug 2018 11:45:26 +0200 Subject: Multires: Synchronize settings with Subsurf modifier Currently no functional changes, just exposes all settings which we need for OpenSubdiv, similar to what Subsurf modifier is doing already. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3602 --- source/blender/makesdna/DNA_modifier_types.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna/DNA_modifier_types.h') diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 404e8d2d137..642e7d14869 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -140,7 +140,7 @@ typedef enum { eSubsurfModifierFlag_DebugIncr = (1 << 1), eSubsurfModifierFlag_ControlEdges = (1 << 2), /* DEPRECATED, ONLY USED FOR DO-VERSIONS */ - eSubsurfModifierFlag_SubsurfUv = (1 << 3), + eSubsurfModifierFlag_SubsurfUv_DEPRECATED = (1 << 3), } SubsurfModifierFlag; typedef enum { @@ -155,7 +155,7 @@ typedef enum { SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE = 3, SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES = 4, SUBSURF_UV_SMOOTH_ALL = 5, -} eSubsurfModifierUVSmooth; +} eSubsurfUVSmooth; typedef struct SubsurfModifierData { ModifierData modifier; @@ -844,11 +844,15 @@ typedef struct MultiresModifierData { char lvl, sculptlvl, renderlvl, totlvl; char simple, flags, pad[2]; + short quality; + short uv_smooth; + short pad2[2]; } MultiresModifierData; typedef enum { eMultiresModifierFlag_ControlEdges = (1 << 0), - eMultiresModifierFlag_PlainUv = (1 << 1), + /* DEPRECATED, only used for versioning. */ + eMultiresModifierFlag_PlainUv_DEPRECATED = (1 << 1), } MultiresModifierFlag; typedef struct FluidsimModifierData { -- cgit v1.2.3