[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46805] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fix bug #31529 Remesh remove Apply as Shape button

[Nicholas Bishop]

Revision: 46805
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46805
Author:   nicholasbishop
Date:     2012-05-20 15:00:19 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Fix bug #31529 Remesh remove Apply as Shape button

Change modifier_sameTopology() to not not treat Nonconstructive
modifiers as having same topology. This function is only used to test
whether Apply as Shape is allowed.

The exact nature of "nonconstructive" modifiers is not documented, but
current list is remesh, fluidsim, decimate, mask, build, and
boolean. All of these modify topology, and should not be making making
shape keys.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-05-20 13:56:42 UTC (rev 46804)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-05-20 15:00:19 UTC (rev 46805)
@@ -250,8 +250,7 @@
 int modifier_sameTopology(ModifierData *md)
 {
 	ModifierTypeInfo *mti = modifierType_getInfo(md->type);
-	return ELEM3(mti->type, eModifierTypeType_OnlyDeform, eModifierTypeType_Nonconstructive,
-	             eModifierTypeType_NonGeometrical);
+	return ELEM(mti->type, eModifierTypeType_OnlyDeform, eModifierTypeType_NonGeometrical);
 }
 
 int modifier_nonGeometrical(ModifierData *md)