sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for mistake checking engines on load.

Browse Source
This commit is contained in:
Campbell Barton 2011-04-13 00:51:48 +00:00
parent 84e793a6f9
commit b68c911931
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ void BPY_python_start(int argc, const char **argv)
bpy_python_start_path(); /* allow to use our own included python */
/* Python 3.2 now looks for '2.56/python/include/python3.2d/pyconfig.h' to parse
/* Python 3.2 now looks for '2.57/python/include/python3.2d/pyconfig.h' to parse
* from the 'sysconfig' module which is used by 'site', so for now disable site.
* alternatively we could copy the file. */
Py_NoSiteFlag= 1;
@ -552,7 +552,7 @@ int BPY_string_exec(bContext *C, const char *expr)
PyObject *main_mod= NULL;
PyObject *py_dict, *retval;
int error_ret= 0;
Main *bmain_back;
Main *bmain_back; /* XXX, quick fix for release (Copy Settings crash), needs further investigation */
if (!expr) return -1;

2
source/blender/windowmanager/intern/wm_files.c
View File

@ -344,7 +344,7 @@ void WM_read_file(bContext *C, const char *name, ReportList *reports)
{
Scene *sce;
for(sce= G.main->scene.first; sce; sce= sce->id.next) {
if(BLI_findstring(&R_engines, sce->r.engine, offsetof(RenderEngineType, idname)) == NULL) {
if(sce->r.engine[0] && BLI_findstring(&R_engines, sce->r.engine, offsetof(RenderEngineType, idname)) == NULL) {
BKE_reportf(reports, RPT_WARNING, "Engine not available: '%s' for scene: %s, an addon may need to be installed or enabled", sce->r.engine, sce->id.name+2);
}
}