[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30634] trunk/blender/source/blender/ makesrna: Bugfix: Mem cache limit wasn't updated, when changed in userpref.

[Peter Schlaile]

Revision: 30634
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30634
Author:   schlaile
Date:     2010-07-22 16:02:05 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
Bugfix: Mem cache limit wasn't updated, when changed in userpref.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2010-07-22 12:51:04 UTC (rev 30633)
+++ trunk/blender/source/blender/makesrna/SConscript	2010-07-22 14:02:05 UTC (rev 30634)
@@ -6,7 +6,7 @@
 o = SConscript('intern/SConscript')
 objs += o
 
-incs = '#/intern/guardedalloc #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
+incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
 incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin'
 incs += ' ../render/extern/include'
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-07-22 12:51:04 UTC (rev 30633)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-07-22 14:02:05 UTC (rev 30634)
@@ -51,6 +51,7 @@
 #include "BKE_global.h"
 
 #include "MEM_guardedalloc.h"
+#include "MEM_CacheLimiterC-Api.h"
 
 static void rna_userdef_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
@@ -171,6 +172,11 @@
 	sound_init(bmain);
 }
 
+static void rna_Userdef_memcache_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
+}
+
 static void rna_UserDef_weight_color_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	Object *ob;
@@ -2477,6 +2483,7 @@
 	RNA_def_property_int_sdna(prop, NULL, "memcachelimit");
 	RNA_def_property_range(prop, 0, (sizeof(void *) ==8)? 1024*16: 1024); /* 32 bit 2 GB, 64 bit 16 GB */
 	RNA_def_property_ui_text(prop, "Memory Cache Limit", "Memory cache limit in sequencer (megabytes)");
+	RNA_def_property_update(prop, 0, "rna_Userdef_memcache_update");
 
 	prop= RNA_def_property(srna, "frame_server_port", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "frameserverport");