[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42475] trunk/blender/source/blender: fix for noise module in driver namespace (was infact mathutils).

Campbell Barton ideasman42 at gmail.com
Wed Dec 7 01:37:01 CET 2011


Revision: 42475
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42475
Author:   campbellbarton
Date:     2011-12-07 00:36:57 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
fix for noise module in driver namespace (was infact mathutils).

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_object_types.h
    trunk/blender/source/blender/python/intern/bpy_driver.c

Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h	2011-12-07 00:25:21 UTC (rev 42474)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h	2011-12-07 00:36:57 UTC (rev 42475)
@@ -219,7 +219,7 @@
 	ListBase controllers;	/* game logic controllers */
 	ListBase actuators;		/* game logic actuators */
 
-	float bbsize[3];
+	float bbsize[3]  DNA_DEPRECATED;
 	short index;			/* custom index, for renderpasses */
 	unsigned short actdef;	/* current deformation group, note: index starts at 1 */
 	float col[4];			/* object color */

Modified: trunk/blender/source/blender/python/intern/bpy_driver.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_driver.c	2011-12-07 00:25:21 UTC (rev 42474)
+++ trunk/blender/source/blender/python/intern/bpy_driver.c	2011-12-07 00:36:57 UTC (rev 42475)
@@ -82,9 +82,10 @@
 	}
 
 	/* add noise to global namespace */
-	mod= PyImport_ImportModuleLevel((char *)"mathutils.noise", NULL, NULL, NULL, 0);
+	mod= PyImport_ImportModuleLevel((char *)"mathutils", NULL, NULL, NULL, 0);
 	if (mod) {
-		PyDict_SetItemString(bpy_pydriver_Dict, "noise", mod);
+		PyObject *modsub= PyDict_GetItemString(PyModule_GetDict(mod), "noise");
+		PyDict_SetItemString(bpy_pydriver_Dict, "noise", modsub);
 		Py_DECREF(mod);
 	}
 




More information about the Bf-blender-cvs mailing list