diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-09-23 18:20:59 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-09-28 17:58:27 +0300 |
commit | 728ae33f3720894a59009e28d33ae82f77c380b3 (patch) | |
tree | e504c26dd92fccf3f0ba4021aceebb65fb9b028b /intern/cycles/integrator/path_trace.cpp | |
parent | 52a702468a59f1945ecfcf6dde6bccf648a27d36 (diff) |
Cycles: Improve handling of tile file error
Expose them to the interface, and stop rendering as soon as possible.
Differential Revision: https://developer.blender.org/D12617
Diffstat (limited to 'intern/cycles/integrator/path_trace.cpp')
-rw-r--r-- | intern/cycles/integrator/path_trace.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp index e785c0d1b19..10d0c5e7b4c 100644 --- a/intern/cycles/integrator/path_trace.cpp +++ b/intern/cycles/integrator/path_trace.cpp @@ -801,7 +801,7 @@ void PathTrace::tile_buffer_write_to_disk() } if (!tile_manager_.write_tile(*buffers)) { - LOG(ERROR) << "Error writing tile to file."; + device_->set_error("Error writing tile to file"); } } @@ -894,7 +894,14 @@ void PathTrace::process_full_buffer_from_disk(string_view filename) DenoiseParams denoise_params; if (!tile_manager_.read_full_buffer_from_disk(filename, &full_frame_buffers, &denoise_params)) { - LOG(ERROR) << "Error reading tiles from file."; + const string error_message = "Error reading tiles from file"; + if (progress_) { + progress_->set_error(error_message); + progress_->set_cancel(error_message); + } + else { + LOG(ERROR) << error_message; + } return; } |