Merging fluidcontrol to trunk from rev16649 fluidcontrol branch. Code provided by...

[blender-staging.git] / source / blender / makesdna / DNA_modifier_types.h

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 6b2f4ed96b2788d9c9be82ab6af20e1265d8fca1..114dfe10baeb5882098b1fd8481f1cbce63b2ae5 100644 (file)
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -35,8 +35,8 @@ typedef enum ModifierType {
        eModifierType_Cloth,
        eModifierType_Collision,
        eModifierType_Bevel,
        eModifierType_Cloth,
        eModifierType_Collision,
        eModifierType_Bevel,

-       eModifierType_Fluidsim,

        eModifierType_Shrinkwrap,
        eModifierType_Shrinkwrap,

+       eModifierType_Fluidsim,

        NUM_MODIFIER_TYPES
 } ModifierType;
 
        NUM_MODIFIER_TYPES
 } ModifierType;