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 18:58:55 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-05-08 18:58:55 +0400
commitbbf6db0c0cbf395eb8879e878754b2219f5c10b8 (patch)
tree2b66ab879e80fd466ddf8eaf0b15ce6251acfdbe /source/blender/blenkernel/intern/paint.c
parent19bddbfc54110b55ead9b538d9958842cca6d98e (diff)
Fix regression from 2.70:
Multires did not support hiding in zero level. It's a case of PBVH not being used in drawing due to code reporting active modifiers being used. However multires level zero can be treated as effectively no modifier and we can use mesh PBVH.
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
-rw-r--r--source/blender/blenkernel/intern/paint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 2486f9062c7..009e8cc7ff5 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -560,7 +560,7 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
for (; md; md = md->next) {
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
if (!modifier_isEnabled(scene, md, eModifierMode_Realtime)) continue;
- if (md->type == eModifierType_ShapeKey) continue;
+ if (ELEM(md->type, eModifierType_ShapeKey, eModifierType_Multires)) continue;
if (mti->type == eModifierTypeType_OnlyDeform) return 1;
else if ((sd->flags & SCULPT_ONLY_DEFORM) == 0) return 1;