Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-05-08 20:25:46 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-05-08 20:25:46 +0400
commit732bc8fcae1e2ff0cde489b8fbc130fa25e25fa1 (patch)
treebf1e32abdab546ba1a940767b62f518fc702bdc0
parent0d85be59506efebf7df691f80ed24d12c767b3ae (diff)
Clarification of UI messages:
Show that modifier may not be supported in dyntopo rather than sculpt mode in general. This is useful information since users may confuse the two. Multires for instance is surely supported in sculpt mode, but not in dyntopo.
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 43ee33e61cb..8634b617c53 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1599,7 +1599,8 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
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)
+ continue;
}
if (sculpt_dyntopo && !useRenderParams)
@@ -1611,7 +1612,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
unsupported |= multires_applied;
if (unsupported) {
- modifier_setError(md, "Not supported in sculpt mode");
+ if (sculpt_dyntopo)
+ modifier_setError(md, "Not supported in dyntopo");
+ else
+ modifier_setError(md, "Not supported in sculpt mode");
continue;
}
else {