fix for mistake checking engines on load.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 13 Apr 2011 00:51:48 +0000 (00:51 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 13 Apr 2011 00:51:48 +0000 (00:51 +0000)
source/blender/python/intern/bpy_interface.c
source/blender/windowmanager/intern/wm_files.c

index d323c2a3475658ab40d18a61407fd36336af8fcb..83c52464c9c5833ca4a7cb568130a6de6e1d438e 100644 (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;
 
index c85b6767a337a6a879bc612d5978f0eb207888fb..3d10a76641709ca425c275df2da77a7584fdb8f1 100644 (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);
                                }
                        }