diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-11-19 15:16:14 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-11-19 15:16:14 +0300 |
| commit | 7f96323cd001bc7555d0f145027e3bbbbc1462b8 (patch) | |
| tree | 842a4ac4095be5c22bd0a505612c731351839a29 /intern/cycles/device/device_cuda.cpp | |
| parent | 4de142e0b7ba014a3e1e41672600aa38465f2454 (diff) | |
| parent | 3133d2d58c391544a48342860120336e2a0f944e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 35b451c7a9c..c9e1fcad8f2 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -1436,6 +1436,8 @@ public: void path_trace(DeviceTask& task, RenderTile& rtile, device_vector<WorkTile>& work_tiles) { + scoped_timer timer(&rtile.buffers->render_time); + if(have_error()) return; |