diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-11-30 23:22:27 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-11-30 23:22:27 +0300 |
| commit | d369a44dde48f048be913d7e758d625c64628a5b (patch) | |
| tree | a1ff5d36995cfa4f761d20abc8dee5fa9b84c1c6 /source | |
| parent | 22188fba21880caa88a108db13f41c947c76f8c5 (diff) | |
Orange bugreport; disabling (with small icon button) a deforming modifier
for EditMode, the CrazySpace correction still worked. Made it check for
the modifier mode flag.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 19bd31386ff..ea65d311e53 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1586,12 +1586,15 @@ int modifiers_isDeformed(Object *ob) ModifierData *md = modifiers_getVirtualModifierList(ob); for (; md; md=md->next) { - if (md->type==eModifierType_Armature) - return 1; - if (md->type==eModifierType_Curve) - return 1; - if (md->type==eModifierType_Lattice) - return 1; + if(ob==G.obedit && (md->mode & eModifierMode_Editmode)==0); + else { + if (md->type==eModifierType_Armature) + return 1; + if (md->type==eModifierType_Curve) + return 1; + if (md->type==eModifierType_Lattice) + return 1; + } } return 0; } |