[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20660] trunk/blender/source: bpy.config. sequenceMemCacheLimit is the only way to set the memcache in background mode and it didnt work .

[Campbell Barton]

Revision: 20660
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20660
Author:   campbellbarton
Date:     2009-06-05 21:22:23 +0200 (Fri, 05 Jun 2009)

Log Message:
-----------
bpy.config.sequenceMemCacheLimit is the only way to set the memcache in 
background mode and it didnt work.
removed some unused vars from KX_Scene

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/bpy_config.c
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
    trunk/blender/source/gameengine/Ketsji/KX_Scene.h

Modified: trunk/blender/source/blender/python/api2_2x/bpy_config.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/bpy_config.c    2009-06-05 
17:45:17 UTC (rev 20659)
+++ trunk/blender/source/blender/python/api2_2x/bpy_config.c    2009-06-05 
19:22:23 UTC (rev 20660)
@@ -32,6 +32,7 @@
 #include "../api2_2x/gen_utils.h"
 #include "bpy_config.h"
 #include "BKE_utildefines.h"
+#include "../../../../intern/memutil/MEM_CacheLimiterC-Api.h"
 
 enum conf_consts {
        /*string*/
@@ -219,7 +220,7 @@
 static int setIntAttrClamp( BPy_Config *self, PyObject *value, void *type )
 {
        void *param;
-       int min, max, size;
+       int min, max, size, ret;
 
        switch( GET_INT_FROM_POINTER(type) ) {
        case EXPP_CONF_ATTR_UNDOSTEPS:
@@ -257,7 +258,13 @@
                return EXPP_ReturnIntError( PyExc_RuntimeError,
                                "undefined type in setIntAttrClamp");
        }
-       return EXPP_setIValueClamped( value, param, min, max, size );
+       
+       ret = EXPP_setIValueClamped( value, param, min, max, size );
+       
+       if(GET_INT_FROM_POINTER(type) == EXPP_CONF_ATTR_MEM_CACHE_LIMIT)
+               MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
+       
+       return ret;
 }
 
 static PyGetSetDef Config_getseters[] = {

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-06-05 17:45:17 UTC 
(rev 20659)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2009-06-05 19:22:23 UTC 
(rev 20660)
@@ -207,9 +207,6 @@
        m_rootnode = NULL;
 
        m_bucketmanager=new RAS_BucketManager();
-
-       m_canvasDesignWidth = 0;
-       m_canvasDesignHeight = 0;
        
        m_attr_dict = PyDict_New(); /* new ref */
 }

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.h   2009-06-05 17:45:17 UTC 
(rev 20659)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.h   2009-06-05 19:22:23 UTC 
(rev 20660)
@@ -189,11 +189,6 @@
         */
        KX_Camera* m_active_camera;
 
-       /** Desired canvas width set at design time. */
-       unsigned int m_canvasDesignWidth;
-       /** Desired canvas height set at design time. */
-       unsigned int m_canvasDesignHeight;
-
        /**
         * Another temporary variable outstaying its welcome
         * used in AddReplicaObject to map game objects to their


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs