diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-02 21:58:09 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-02 21:58:09 +0400 |
| commit | 87cb3f8519c942e19b20ac2b6bbe82fd28b95b3c (patch) | |
| tree | a59f83e787fe34a39be660bf60218eeb0b70ffd7 /source/blender/makesrna/intern/rna_fluidsim.c | |
| parent | 2fb2075c5b3495fede6980b4f9247f9e89c39d39 (diff) | |
Fix crash caused by recently added assert about if string was set properly.
Memory Estimate is actually 31 characters length, str[31] is a null-terminator.
Return length of 31 for memory estimate property. Returning proper length
would lead to slowdown because of 2x iteration through vertices.
Diffstat (limited to 'source/blender/makesrna/intern/rna_fluidsim.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 1ba2e32502f..ccb24d7dd9b 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -184,7 +184,11 @@ static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *v static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *ptr) { - return 32; +#ifdef DISABLE_ELBEEM + return 0; +#else + return 31; +#endif } static char *rna_FluidSettings_path(PointerRNA *ptr) |