diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
| commit | efaf512406c71606d7f05eca10c74510bd9ebc12 (patch) | |
| tree | d42a01041ba165f13ad1b3c42bc118bd3c82b0c3 /intern/cycles/render/session.h | |
| parent | aecb2f7039f0af91bd1eb03a64957bcd532c9408 (diff) | |
Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."
This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498
The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.
Diffstat (limited to 'intern/cycles/render/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index a3a2751fb23..eda8b3da60e 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -116,7 +116,6 @@ public: bool ready_to_reset(); void reset(BufferParams& params, int samples); - bool resetting() const; void set_samples(int samples); void set_pause(bool pause); @@ -140,12 +139,10 @@ protected: void run_cpu(); bool draw_cpu(BufferParams& params); void reset_cpu(BufferParams& params, int samples); - bool resetting_cpu() const; void run_gpu(); bool draw_gpu(BufferParams& params); void reset_gpu(BufferParams& params, int samples); - bool resetting_gpu() const; bool acquire_tile(Device *tile_device, RenderTile& tile); void update_tile_sample(RenderTile& tile); |