diff options
author | Patrick Mours <pmours@nvidia.com> | 2020-06-12 17:42:49 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2020-06-12 19:24:15 +0300 |
commit | b586f801fc921f9f420260fb3ff4f26cb6773157 (patch) | |
tree | 8370736aec591a2424c09aa35863a4ba3f92dae4 /intern/cycles/render | |
parent | 5dca72dfc924ff931ae46b35a6342beec87f9fc4 (diff) |
Cycles: Improve CUDA and OptiX error reporting in the viewport
This patch makes the infamous "Cancel" error in the viewport a thing of the past. Instead it
now shows a more useful error message and streamlines the error handling process in CUDA.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D8008
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 7c50140ecfe..f5bfebbaf78 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -833,7 +833,7 @@ bool Session::load_kernels(bool lock_scene) message = "Failed loading render kernel, see console for errors"; progress.set_error(message); - progress.set_status("Error", message); + progress.set_status(message); progress.set_update(); return false; } @@ -872,7 +872,7 @@ void Session::run() /* progress update */ if (progress.get_cancel()) - progress.set_status("Cancel", progress.get_cancel_message()); + progress.set_status(progress.get_cancel_message()); else progress.set_update(); } |