diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
| commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
| tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /intern/cycles/blender/blender_viewport.cpp | |
| parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
| parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) | |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'intern/cycles/blender/blender_viewport.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_viewport.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp index 93e84e28032..73ef5f94720 100644 --- a/intern/cycles/blender/blender_viewport.cpp +++ b/intern/cycles/blender/blender_viewport.cpp @@ -61,17 +61,6 @@ const bool BlenderViewportParameters::custom_viewport_parameters() const return !(use_scene_world && use_scene_lights); } -bool BlenderViewportParameters::get_viewport_display_denoising(BL::SpaceView3D &b_v3d, - BL::Scene &b_scene) -{ - bool use_denoising = false; - if (b_v3d) { - PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); - use_denoising = get_enum(cscene, "preview_denoising") != 0; - } - return use_denoising; -} - PassType BlenderViewportParameters::get_viewport_display_render_pass(BL::SpaceView3D &b_v3d) { PassType display_pass = PASS_NONE; @@ -83,11 +72,6 @@ PassType BlenderViewportParameters::get_viewport_display_render_pass(BL::SpaceVi return display_pass; } -bool update_viewport_display_denoising(BL::SpaceView3D &b_v3d, BL::Scene &b_scene) -{ - return BlenderViewportParameters::get_viewport_display_denoising(b_v3d, b_scene); -} - PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d, vector<Pass> &passes) { if (b_v3d) { |