[Bf-blender-cvs] [8cfb5e9] master: Further work for fix T38804: unnecessary empty space in the modifier UI.

[Brecht Van Lommel]

Commit: 8cfb5e91eadab88347c5650c56f3d389a224798e
Author: Brecht Van Lommel
Date:   Mon Feb 24 22:01:58 2014 +0100
https://developer.blender.org/rB8cfb5e91eadab88347c5650c56f3d389a224798e

Further work for fix T38804: unnecessary empty space in the modifier UI.

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

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

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

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index f9a0d46..2d68882 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;
 	}