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/film.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/film.h')
| -rw-r--r-- | intern/cycles/render/film.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h index 1cfa7c3b77d..20f6261a871 100644 --- a/intern/cycles/render/film.h +++ b/intern/cycles/render/film.h @@ -64,6 +64,7 @@ class Film : public Node { int denoising_flags; float pass_alpha_threshold; + PassType display_pass; int pass_stride; int denoising_data_offset; int denoising_clean_offset; @@ -90,7 +91,7 @@ class Film : public Node { void device_free(Device *device, DeviceScene *dscene, Scene *scene); bool modified(const Film &film); - void tag_passes_update(Scene *scene, const vector<Pass> &passes_); + void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes=true); void tag_update(Scene *scene); }; |