diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 14:44:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 14:44:04 +0400 |
| commit | 48b4de31521501203c39fc7efa9aca7d018b6a1c (patch) | |
| tree | 31a05c15bc56321652912fb1eef9070cd17f8ec4 /intern/cycles/render/session.h | |
| parent | 29bdf37f9d1a5a45b98aeed15d415df27050615b (diff) | |
Cycles:
* auto/fixed threads option is used now, patch by Thomas.
* remove unused CUDA_LIBRARIES, library is dynamically loaded
* fix mesh XML export operator for API update
Diffstat (limited to 'intern/cycles/render/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 7b23a89afc2..3411dcd23c6 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -46,6 +46,7 @@ public: int passes; int tile_size; int min_size; + int threads; double cancel_timeout; double reset_timeout; @@ -61,6 +62,7 @@ public: passes = INT_MAX; tile_size = 64; min_size = 64; + threads = 0; cancel_timeout = 0.1; reset_timeout = 0.1; @@ -75,6 +77,7 @@ public: && progressive == params.progressive && tile_size == params.tile_size && min_size == params.min_size + && threads == params.threads && cancel_timeout == params.cancel_timeout && reset_timeout == params.reset_timeout && text_timeout == params.text_timeout); } |