[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36139] trunk/blender/source/blender: fix for mistake checking engines on load.

[Campbell Barton]

Revision: 36139
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36139
Author:   campbellbarton
Date:     2011-04-13 00:51:48 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
fix for mistake checking engines on load.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_interface.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2011-04-13 00:35:48 UTC (rev 36138)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2011-04-13 00:51:48 UTC (rev 36139)
@@ -244,7 +244,7 @@
 
 	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 @@
 	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;
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-04-13 00:35:48 UTC (rev 36138)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-04-13 00:51:48 UTC (rev 36139)
@@ -344,7 +344,7 @@
 		{
 			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);
 				}
 			}