Campbell Barton
a0cece42c6
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.
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
/*
|
|
* $Id$
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* This is a new part of Blender.
|
|
*
|
|
* Contributor(s): Willian P. Germano, Campbell Barton
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/* Note, the BGE needs to use this too, keep it minimal */
|
|
|
|
#ifndef EXPP_bpy_import_h
|
|
#define EXPP_bpy_import_h
|
|
|
|
/* python redefines :/ */
|
|
#ifdef _POSIX_C_SOURCE
|
|
#undef _POSIX_C_SOURCE
|
|
#endif
|
|
|
|
#ifdef _XOPEN_SOURCE
|
|
#undef _XOPEN_SOURCE
|
|
#endif
|
|
|
|
#include <Python.h>
|
|
#include "compile.h" /* for the PyCodeObject */
|
|
#include "eval.h" /* for PyEval_EvalCode */
|
|
|
|
struct Text;
|
|
|
|
PyObject* bpy_text_import( struct Text *text );
|
|
PyObject* bpy_text_import_name( char *name, int *found );
|
|
PyObject* bpy_text_reimport( PyObject *module, int *found );
|
|
/* void bpy_text_clear_modules( int clear_all );*/ /* Clear user modules */
|
|
|
|
void bpy_text_filename_get(char *fn, struct Text *text);
|
|
|
|
extern PyMethodDef bpy_import_meth[];
|
|
extern PyMethodDef bpy_reload_meth[];
|
|
|
|
/* The game engine has its own Main struct, if this is set search this rather then G.main */
|
|
struct Main *bpy_import_main_get(void);
|
|
void bpy_import_main_set(struct Main *maggie);
|
|
|
|
/* name namespace function for bpy & bge */
|
|
PyObject *bpy_namespace_dict_new(const char *filename);
|
|
|
|
#endif /* EXPP_bpy_import_h */
|