diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-08 22:58:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-08 22:58:07 +0400 |
| commit | 9b31cba74e2bd84e9988ebdab723e6e43f9b8357 (patch) | |
| tree | fb8e8e539247f916784fb967387641f7a9291ace /intern/cycles/render/session.cpp | |
| parent | 6b134ae357188358f1437650924ab38886386860 (diff) | |
Cycles: some warning fixes, cpu device task tweaks, avoid unnecessary
tonemap in non-viewport render, and some utility functions.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index d3482e7f92f..f66c4a64b0b 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -79,6 +79,8 @@ Session::~Session() } if(params.output_path != "") { + tonemap(); + progress.set_status("Writing Image", params.output_path); display->write(device, params.output_path); } @@ -352,7 +354,8 @@ void Session::run_cpu() /* update status and timing */ update_status_time(); - need_tonemap = true; + if(!params.background) + need_tonemap = true; } device->task_wait(); |