[Bf-blender-cvs] [6b538f4] master: Fix T40445: Disabled modifiers prevent cage edit mode.

[Bastien Montagne]

Commit: 6b538f42718c175ad5659d394094b512ac058756
Author: Bastien Montagne
Date:   Fri May 30 20:22:23 2014 +0200
https://developer.blender.org/rB6b538f42718c175ad5659d394094b512ac058756

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!

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

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

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

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

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs