diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-06-03 12:26:12 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-06-03 12:26:12 +0400 |
commit | 29d0c8cb19d45966e7716f0099cb6c2a7e6fbd2d (patch) | |
tree | 0ea9c79e8dc520ea66052f7445dadc2712683d80 /source/blender | |
parent | 29871b29b504d97965c1edd7ef178af5be392d88 (diff) |
Fix #35610: Multiresolution Modifier Complains About Sculpt Mode
If multires has got zero subdivisions in sculpt mode, no need
of displaying warning message. It was rather strange decision
which confused artists.
Now multires with zero subdivisions will be ignored silently
when in sculpt mode.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index dd36ea4bcd8..a99f6601c3e 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1609,13 +1609,17 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos { int unsupported = 0; + if (md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0) { + /* If multires is on level 0 skip it silently without warning message. */ + continue; + } + if (sculpt_dyntopo && !useRenderParams) unsupported = TRUE; if (scene->toolsettings->sculpt->flags & SCULPT_ONLY_DEFORM) unsupported |= mti->type != eModifierTypeType_OnlyDeform; - unsupported |= md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0; unsupported |= multires_applied; if (unsupported) { |