diff options
Diffstat (limited to 'intern/cycles/blender/blender_viewport.cpp')
-rw-r--r-- | intern/cycles/blender/blender_viewport.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp index 93dd8faa450..a74b20f150b 100644 --- a/intern/cycles/blender/blender_viewport.cpp +++ b/intern/cycles/blender/blender_viewport.cpp @@ -15,6 +15,8 @@ */ #include "blender_viewport.h" +#include "blender_util.h" + CCL_NAMESPACE_BEGIN BlenderViewportParameters::BlenderViewportParameters() @@ -59,4 +61,38 @@ const bool BlenderViewportParameters::custom_viewport_parameters() const return !(use_scene_world && use_scene_lights); } +PassType BlenderViewportParameters::get_viewport_display_render_pass(BL::SpaceView3D &b_v3d) +{ + PassType display_pass = PASS_NONE; + if (b_v3d) { + BL::View3DShading b_view3dshading = b_v3d.shading(); + PointerRNA cshading = RNA_pointer_get(&b_view3dshading.ptr, "cycles"); + display_pass = (PassType)get_enum(cshading, "render_pass", -1, -1); + } + return display_pass; +} + +PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d, + vector<Pass> &passes, + bool reset_passes) +{ + if (b_v3d) { + PassType display_pass = BlenderViewportParameters::get_viewport_display_render_pass(b_v3d); + + if (reset_passes) { + passes.clear(); + /* We always need a combined pass for now. It would be a good optimization + * to support rendering without combined pass. */ + Pass::add(PASS_COMBINED, passes); + } + + if (display_pass != PASS_COMBINED) { + Pass::add(display_pass, passes); + } + + return display_pass; + } + return PASS_NONE; +} + CCL_NAMESPACE_END |