diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-30 22:22:23 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-05-30 22:22:23 +0400 |
| commit | 6b538f42718c175ad5659d394094b512ac058756 (patch) | |
| tree | b80e1dda4ff2aa04f95f226505d4976120dd44e0 /source/blender/blenkernel/intern/modifier.c | |
| parent | 2c69f1e574587c2364e9a94b45d0b363ffeebf61 (diff) | |
Fix T40445: Disabled modifiers prevent cage edit mode.
No valid reason to make non-mapping modifiers break edit cage,
when they are disabled in 3DView/edit mode!
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 563831616de..b5cbec2870b 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -357,6 +357,9 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_lastPossibleC if (!(mti->flags & eModifierTypeFlag_SupportsEditmode)) continue; if (md->mode & eModifierMode_DisableTemporary) continue; + if (!(md->mode & eModifierMode_Realtime)) continue; + if (!(md->mode & eModifierMode_Editmode)) continue; + if (!modifier_supportsMapping(md)) break; @@ -364,9 +367,6 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_lastPossibleC *r_lastPossibleCageIndex = i; } - if (!(md->mode & eModifierMode_Realtime)) continue; - if (!(md->mode & eModifierMode_Editmode)) continue; - if (md->mode & eModifierMode_OnCage) cageIndex = i; } |