[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52048] trunk/blender/intern/cycles: Fix #32972: cycles crash changing to GPU render with OSL enabled.

[Brecht Van Lommel]

Revision: 52048
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52048
Author:   blendix
Date:     2012-11-09 21:27:05 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Fix #32972: cycles crash changing to GPU render with OSL enabled.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_python.cpp
    trunk/blender/intern/cycles/render/scene.cpp

Modified: trunk/blender/intern/cycles/blender/blender_python.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_python.cpp	2012-11-09 20:38:09 UTC (rev 52047)
+++ trunk/blender/intern/cycles/blender/blender_python.cpp	2012-11-09 21:27:05 UTC (rev 52048)
@@ -284,6 +284,8 @@
 				if(param->validdefault)
 					default_string = param->sdefault[0];
 			}
+			else
+				continue;
 		}
 		else
 			continue;

Modified: trunk/blender/intern/cycles/render/scene.cpp
===================================================================
--- trunk/blender/intern/cycles/render/scene.cpp	2012-11-09 20:38:09 UTC (rev 52047)
+++ trunk/blender/intern/cycles/render/scene.cpp	2012-11-09 21:27:05 UTC (rev 52048)
@@ -44,6 +44,10 @@
 	device = NULL;
 	memset(&dscene.data, 0, sizeof(dscene.data));
 
+	/* OSL only works on the CPU */
+	if(device_info_.type != DEVICE_CPU)
+		params.shadingsystem = SceneParams::SVM;
+
 	camera = new Camera();
 	filter = new Filter();
 	film = new Film();