diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-05 19:17:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-05 20:15:04 +0300 |
| commit | bd0b9ed0c0436cda050f139b9d30bd3d0648d09a (patch) | |
| tree | 628ca63fe332cd78bdf0f58530dbf32348434655 /intern/cycles/render/session.cpp | |
| parent | 716890e864b3730386a526703f4401a697de047a (diff) | |
Cycles: Add dedicated Progress::set_error() call
Currently it acts the same as set_cancel(), but this way we're able to
distinguish situations when rendering was aborted by user demand (for
example pressing Esc in standalone renderer) or if something went horribly
wrong (for example out of VRAM error).
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 9fcd9fa85f5..c03a3dd081d 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -251,7 +251,7 @@ void Session::run_gpu() update_scene(); if(!device->error_message().empty()) - progress.set_cancel(device->error_message()); + progress.set_error(device->error_message()); if(progress.get_cancel()) break; @@ -292,7 +292,7 @@ void Session::run_gpu() } if(!device->error_message().empty()) - progress.set_cancel(device->error_message()); + progress.set_error(device->error_message()); tiles_written = update_progressive_refine(progress.get_cancel()); @@ -540,7 +540,7 @@ void Session::run_cpu() update_scene(); if(!device->error_message().empty()) - progress.set_cancel(device->error_message()); + progress.set_error(device->error_message()); if(progress.get_cancel()) break; @@ -558,7 +558,7 @@ void Session::run_cpu() need_tonemap = true; if(!device->error_message().empty()) - progress.set_cancel(device->error_message()); + progress.set_error(device->error_message()); } device->task_wait(); @@ -580,7 +580,7 @@ void Session::run_cpu() } if(!device->error_message().empty()) - progress.set_cancel(device->error_message()); + progress.set_error(device->error_message()); tiles_written = update_progressive_refine(progress.get_cancel()); } @@ -604,7 +604,7 @@ void Session::load_kernels() if(message.empty()) message = "Failed loading render kernel, see console for errors"; - progress.set_cancel(message); + progress.set_error(message); progress.set_status("Error", message); progress.set_update(); return; |