diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-05 13:47:20 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-11 13:19:44 +0300 |
commit | 7e61e597253f3ca75f2fb86a57212ca750ffbbe8 (patch) | |
tree | 6dbe0bf05fc3380f9729bf719ed1223997d5b0e3 /intern/cycles/render/session.h | |
parent | d4f8bc80a4bd69707a92e7141a2fb67d3f668c58 (diff) |
Cycles: Display RenderPass in Viewport
This change allows the user to select a renderpass in the 3d viewport.
Added support for external renderers to extend the `View3DShading` struct.
This way Blender doesn't need to know the features an external render engine wants to support.
Note that the View3DShading is also available in the scene->display.shading; although this is
supported, it does not make sense for render engines to put something here as it is really
scene/workbench related.
Currently cycles assumes that it always needs to calculate the combined pass; it ignores the
`pass_flag` in KernelFilm. We could optimize this but that was not in scope of this change
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D5689
Diffstat (limited to 'intern/cycles/render/session.h')
-rw-r--r-- | intern/cycles/render/session.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 60d8f7a8b14..9fffc13dd41 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -176,7 +176,7 @@ class Session { void update_status_time(bool show_pause = false, bool show_done = false); - void tonemap(int sample); + void copy_to_display_buffer(int sample); void render(); void reset_(BufferParams ¶ms, int samples); @@ -202,8 +202,8 @@ class Session { volatile bool display_outdated; volatile bool gpu_draw_ready; - volatile bool gpu_need_tonemap; - thread_condition_variable gpu_need_tonemap_cond; + volatile bool gpu_need_display_buffer_update; + thread_condition_variable gpu_need_display_buffer_update_cond; bool pause; thread_condition_variable pause_cond; |