diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-10-03 17:02:34 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-10-03 17:02:34 +0400 |
commit | 59dbf08253adf987870c279eff442527606f7174 (patch) | |
tree | 50265fe3ed8466678ad5baa971da3eac26aa41ff /source | |
parent | 87b40377331ae501ee6d5cf2b57666ee04346e87 (diff) |
Bugfix for fluidsim UI inconsistencies, please check your settings in old files
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 9c1b3ee5a8d..4580c6cbf8b 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -77,7 +77,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd) if(!fss) return; - fss->type = 0; + fss->type = OB_FSBND_NOSLIP; fss->show_advancedoptions = 0; fss->resolutionxyz = 50; diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index fde1ce57875..2914330a2b0 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -142,7 +142,7 @@ typedef struct FluidsimSettings { #define OB_FLUIDSIM_PARTICLE 64 #define OB_FLUIDSIM_CONTROL 128 -#define OB_TYPEFLAG_START 0 +#define OB_TYPEFLAG_START 7 #define OB_FSGEO_THIN (1<<(OB_TYPEFLAG_START+1)) #define OB_FSBND_NOSLIP (1<<(OB_TYPEFLAG_START+2)) #define OB_FSBND_PARTSLIP (1<<(OB_TYPEFLAG_START+3)) |