diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-25 01:01:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-26 00:49:38 +0400 |
| commit | 8cfb5e91eadab88347c5650c56f3d389a224798e (patch) | |
| tree | bc09f158bf3d4ae0ce9ae79f983ebb7cbeb62873 /source/blender/blenkernel/intern/modifier.c | |
| parent | eb4f2b489702498d1c6ad0bd27b5845d8e475a24 (diff) | |
Further work for fix T38804: unnecessary empty space in the modifier UI.
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index f9a0d462ac0..2d6888244d0 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -354,8 +354,6 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *lastPossibleCag md->scene = scene; - if (!(md->mode & eModifierMode_Realtime)) continue; - if (!(md->mode & eModifierMode_Editmode)) continue; if (mti->isDisabled && mti->isDisabled(md, 0)) continue; if (!(mti->flags & eModifierTypeFlag_SupportsEditmode)) continue; if (md->mode & eModifierMode_DisableTemporary) continue; @@ -364,6 +362,10 @@ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *lastPossibleCag break; if (lastPossibleCageIndex_r) *lastPossibleCageIndex_r = i; + + if (!(md->mode & eModifierMode_Realtime)) continue; + if (!(md->mode & eModifierMode_Editmode)) continue; + if (md->mode & eModifierMode_OnCage) cageIndex = i; } |