archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 33894.

Browse Source 
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
This commit is contained in:
Tamito Kajiyama
2010-12-27 01:38:23 +00:00
parent 2d1bc90eed c4a56fda6d
commit 3ead3c4ff3
342 changed files with 3965 additions and 3549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/CMakeLists.txt
View File

@@ -67,4 +67,4 @@ if(WITH_BUILDINFO)
add_definitions(-DBUILD_DATE)
endif()
blenderlib(bf_python "${SRC}" "${INC}")
blender_add_lib(bf_python "${SRC}" "${INC}")

15
source/blender/python/intern/bpy_interface.c
View File

@@ -252,11 +252,24 @@ void BPY_start_python( int argc, char **argv )
{ /* our own import and reload functions */
PyObject *item;
PyObject *mod;
//PyObject *m = PyImport_AddModule("__builtin__");
//PyObject *d = PyModule_GetDict(m);
PyObject *d = PyEval_GetBuiltins( );
PyDict_SetItemString(d, "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
// PyDict_SetItemString(d, "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
PyDict_SetItemString(d, "__import__", item=PyCFunction_New(&bpy_import_meth, NULL)); Py_DECREF(item);
/* move reload here
* XXX, use import hooks */
mod= PyImport_ImportModuleLevel((char *)"imp", NULL, NULL, NULL, 0);
if(mod) {
PyDict_SetItemString(PyModule_GetDict(mod), "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
Py_DECREF(mod);
}
else {
BKE_assert(!"unable to load 'imp' module.");
}
}
pyrna_alloc_types();