Revision: 39880
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39880
Author: nazgul
Date: 2011-09-02 17:58:09 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2011-09-02
16:15:18 UTC (rev 39879)
+++ trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c 2011-09-02
17:58:09 UTC (rev 39880)
@@ -184,7 +184,11 @@
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
