diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-05-18 05:14:12 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-05-19 23:24:19 +0300 |
| commit | 177385dc439b4f6b478a033413a8df992e7f5ed3 (patch) | |
| tree | 87d295352627fe53c45b4edd820ba65fa4c888cc /intern/cycles/render/session.h | |
| parent | b6f5e8d9a1aa29720167cf1b1700f76b3e5950a1 (diff) | |
Cycles: Reload kernels from Session when requested features change
This fixes T49496.
Diffstat (limited to 'intern/cycles/render/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index a7ca90abbce..5fb1a365ee9 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -158,7 +158,7 @@ public: void set_pause(bool pause); void update_scene(); - void load_kernels(); + void load_kernels(bool lock_scene=true); void device_free(); @@ -215,6 +215,7 @@ protected: thread_mutex display_mutex; bool kernels_loaded; + DeviceRequestedFeatures loaded_kernel_features; double reset_time; |