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

Fix #32972: cycles crash changing to GPU render with OSL enabled.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-11-09 21:27:05 +00:00
parent dcca228906
commit 3f0fe65635
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_python.cpp
View File

@@ -284,6 +284,8 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
if(param->validdefault) if(param->validdefault)
default_string = param->sdefault[0]; default_string = param->sdefault[0];
} }
else
continue;
} }
else else
continue; continue;

4
intern/cycles/render/scene.cpp
View File

@@ -44,6 +44,10 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
device = NULL; device = NULL;
memset(&dscene.data, 0, sizeof(dscene.data)); 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(); camera = new Camera();
filter = new Filter(); filter = new Filter();
film = new Film(); film = new Film();