diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-26 13:25:02 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-26 13:25:02 +0400 |
| commit | d19894c8cbb9aa54bfd740f634887c6f39354195 (patch) | |
| tree | da8f87010554b9203e41f138271544b36884737d /intern/cycles/blender | |
| parent | c04b3df1af923a6ac9ee2676b095bd4064a5885b (diff) | |
Fix #32972: cycles crash switching OSL to SVM in viewport render.
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 24a561116ec..c63f72c68c6 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -397,7 +397,15 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use } else params.progressive = true; - + + /* shading system - scene level needs full refresh */ + int shadingsystem = RNA_enum_get(&cscene, "shading_system"); + + if(shadingsystem == 0) + params.shadingsystem = SessionParams::SVM; + else if(shadingsystem == 1) + params.shadingsystem = SessionParams::OSL; + return params; } |