[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27106] trunk/blender: - py-drivers were not using the name lookup cache.

[Campbell Barton]

Revision: 27106
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27106
Author:   campbellbarton
Date:     2010-02-23 17:40:55 +0100 (Tue, 23 Feb 2010)

Log Message:
-----------
- py-drivers were not using the name lookup cache.
- use manager context for keymap script.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/python/intern/bpy_driver.c

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-02-23 15:34:02 UTC (rev 27105)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-02-23 16:40:55 UTC (rev 27106)
@@ -1689,7 +1689,7 @@
 
         __import__(config_name)
 
-        wm = bpy.data.window_managers[0]
+        wm = bpy.context.manager
         wm.active_keyconfig = wm.keyconfigs[config_name]
 
         return {'FINISHED'}
@@ -1731,7 +1731,7 @@
         f.write("# Configuration %s\n" % name)
 
         f.write("import bpy\n\n")
-        f.write("wm = bpy.data.window_managers[0]\n")
+        f.write("wm = bpy.context.manager\n")
         f.write("kc = wm.add_keyconfig('%s')\n\n" % name)
 
         for km in kc.keymaps:

Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c	2010-02-23 15:34:02 UTC (rev 27105)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c	2010-02-23 16:40:55 UTC (rev 27106)
@@ -207,6 +207,8 @@
 		for (dvar= driver->variables.first, i=0; dvar; dvar= dvar->next) {
 			PyTuple_SET_ITEM(expr_vars, i++, PyUnicode_InternFromString(dvar->name));
 		}
+		
+		driver->flag &= ~DRIVER_FLAG_RENAMEVAR;
 	}
 	else {
 		expr_vars= PyTuple_GET_ITEM(((PyObject *)driver->expr_comp), 1);