Merging fluidcontrol to trunk from rev16649 fluidcontrol branch. Code provided by...
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 21 Sep 2008 18:20:02 +0000 (18:20 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 21 Sep 2008 18:20:02 +0000 (18:20 +0000)
1  2 
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/render/intern/source/convertblender.c

index 9599cc1d247f6008bb0c81b8be7ced066269e551,6b2f4ed96b2788d9c9be82ab6af20e1265d8fca1..114dfe10baeb5882098b1fd8481f1cbce63b2ae5
@@@ -35,7 -35,8 +35,8 @@@ typedef enum ModifierType 
        eModifierType_Cloth,
        eModifierType_Collision,
        eModifierType_Bevel,
 -      eModifierType_Fluidsim,
        eModifierType_Shrinkwrap,
++      eModifierType_Fluidsim,
        NUM_MODIFIER_TYPES
  } ModifierType;