diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
commit | bd86ba2c88aa912eefb38dc4a809f1ca1e49a31f (patch) | |
tree | b2464a5cc64089772d52c5e9e740a73210d60e6d /source/blender/makesrna/intern/rna_fluidsim.c | |
parent | e48d7f4c111ea61eec467e972be1005f953768b1 (diff) | |
parent | f837b46a2b561293660a0edf9d4de5ff16922f42 (diff) |
svn merge -r41335:41371
Diffstat (limited to 'source/blender/makesrna/intern/rna_fluidsim.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index d2d24e083b1..a7eedf5f062 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -170,7 +170,7 @@ static void rna_FluidSettings_update_type(Main *bmain, Scene *scene, PointerRNA static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *value) { -#ifdef DISABLE_ELBEEM +#ifndef WITH_MOD_FLUID (void)ptr; value[0]= '\0'; #else @@ -183,7 +183,7 @@ static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *v static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *UNUSED(ptr)) { -#ifdef DISABLE_ELBEEM +#ifndef WITH_MOD_FLUID return 0; #else return 31; |