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/render/session.h | |
| parent | c04b3df1af923a6ac9ee2676b095bd4064a5885b (diff) | |
Fix #32972: cycles crash switching OSL to SVM in viewport render.
Diffstat (limited to 'intern/cycles/render/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index a7d2bd56fd1..8941c6ac459 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -57,6 +57,8 @@ public: double reset_timeout; double text_timeout; + enum { OSL, SVM } shadingsystem; + SessionParams() { background = false; @@ -73,6 +75,8 @@ public: cancel_timeout = 0.1; reset_timeout = 0.1; text_timeout = 1.0; + + shadingsystem = SVM; } bool modified(const SessionParams& params) @@ -89,7 +93,8 @@ public: && threads == params.threads && cancel_timeout == params.cancel_timeout && reset_timeout == params.reset_timeout - && text_timeout == params.text_timeout); } + && text_timeout == params.text_timeout + && shadingsystem == params.shadingsystem); } }; |