diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-05-20 23:35:49 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-05-20 23:35:49 +0400 |
| commit | 5413fee77e80157931545946c6bc3fa0ac6d686a (patch) | |
| tree | 1b085775dc5cf42bd9ff99927bb18025fffec11f /source/blender/blenkernel/intern/modifier.c | |
| parent | 37ed2e4f46d43c6011ee756c3e6b0062816bdac6 (diff) | |
Merge from trunk r46614-r46814
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 2159837c9a0..b4c30203000 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -250,8 +250,7 @@ int modifier_couldBeCage(struct Scene *scene, ModifierData *md) 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) |