Blender Git Loki

Git Commits -> Revision a0cece4

Revision a0cece4 by Campbell Barton (master)
August 5, 2010, 03:25 (GMT)
bugfix [#23148] "ImportError: __import__ not found" on changing Render FPS

The BGE was getting the namespace dict directly from __main__ which conflicts
with my recent fix to get the pickle module working which to overwrote the __main__ module on script execution.

Simple fix is to have the BGE and Blender use the same method of getting namespaces.
Renamed CreateGlobalDictionary() to bpy_namespace_dict_new() and moved into bpy_internal_import.c

pickle still wont work in the BGE since we make a copy of __main__ namespace but for speed would rather not have to replace the __main__ module many times per second.

Commit Details:

Full Hash: a0cece42c646df39c858223b0361b7dfe0d44dd8
SVN Revision: 31056
Parent Commit: db5a5c1
Lines Changed: +48, -39

7 Modified Paths:

/source/blender/python/generic/bpy_internal_import.c (+23, -0) (Diff)
/source/blender/python/generic/bpy_internal_import.h (+2, -0) (Diff)
/source/blender/python/intern/bpy_interface.c (+5, -26) (Diff)
/source/gameengine/Converter/KX_ConvertControllers.cpp (+4, -4) (Diff)
/source/gameengine/GameLogic/SCA_PythonController.cpp (+9, -3) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+4, -6) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021