[Bf-blender-cvs] [bbf6db0] master: Fix regression from 2.70:

Antony Riakiotakis noreply at git.blender.org
Thu May 8 16:59:10 CEST 2014


Commit: bbf6db0c0cbf395eb8879e878754b2219f5c10b8
Author: Antony Riakiotakis
Date:   Thu May 8 17:58:55 2014 +0300
https://developer.blender.org/rBbbf6db0c0cbf395eb8879e878754b2219f5c10b8

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.

===================================================================

M	source/blender/blenkernel/intern/paint.c

===================================================================

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 2486f90..009e8cc 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;




More information about the Bf-blender-cvs mailing list