diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-10 01:27:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-10 01:27:05 +0400 |
| commit | 3f0fe65635a27f2ac20aa0fcecf0a56885cb26c5 (patch) | |
| tree | 8cce8173c6b7e6ce9d89f9f4508264079d80d657 /intern/cycles/render/scene.cpp | |
| parent | dcca228906adfe08610174bb3d402ccb321f19cf (diff) | |
Fix #32972: cycles crash changing to GPU render with OSL enabled.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index a2febc31f60..7834aa701ea 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -44,6 +44,10 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_) 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(); |