Revision: 42657
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42657
Author: campbellbarton
Date: 2011-12-16 00:06:01 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
fix [#29635] Attempts to import the site module are met with a TypeError
exception.
Modified Paths:
--------------
trunk/blender/source/blender/python/intern/bpy_app.c
trunk/blender/source/blender/python/intern/bpy_app_handlers.c
Modified: trunk/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app.c 2011-12-15
23:59:02 UTC (rev 42656)
+++ trunk/blender/source/blender/python/intern/bpy_app.c 2011-12-16
00:06:01 UTC (rev 42657)
@@ -260,6 +260,7 @@
/* prevent user from creating new instances */
BlenderAppType.tp_init= NULL;
BlenderAppType.tp_new= NULL;
+ BlenderAppType.tp_hash= (hashfunc)_Py_HashPointer; /* without this we
can't do set(sys.modules) [#29635] */
/* kindof a hack ontop of PyStructSequence */
py_struct_seq_getset_init();
Modified: trunk/blender/source/blender/python/intern/bpy_app_handlers.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_handlers.c
2011-12-15 23:59:02 UTC (rev 42656)
+++ trunk/blender/source/blender/python/intern/bpy_app_handlers.c
2011-12-16 00:06:01 UTC (rev 42657)
@@ -210,6 +210,7 @@
/* prevent user from creating new instances */
BlenderAppCbType.tp_init= NULL;
BlenderAppCbType.tp_new= NULL;
+ BlenderAppCbType.tp_hash= (hashfunc)_Py_HashPointer; /* without this we
can't do set(sys.modules) [#29635] */
/* assign the C callbacks */
if (ret) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
