[Bf-blender-cvs] [c67a8eaba8d] cycles-x: Cleanup: Unused function

Sergey Sharybin noreply at git.blender.org
Mon Sep 13 12:21:13 CEST 2021


Commit: c67a8eaba8d66a5e21c9fb7ccf36856d3ba62ea9
Author: Sergey Sharybin
Date:   Fri Sep 10 17:20:59 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBc67a8eaba8d66a5e21c9fb7ccf36856d3ba62ea9

Cleanup: Unused function

No functional changes.

===================================================================

M	intern/cycles/render/film.cpp
M	intern/cycles/render/film.h

===================================================================

diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 014e9172c15..747b825e687 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -427,18 +427,6 @@ int Film::get_aov_offset(Scene *scene, string name, bool &is_color)
   return -1;
 }
 
-const Pass *Film::get_actual_display_pass(Scene *scene, PassType pass_type, PassMode pass_mode)
-{
-  const Pass *pass = Pass::find(scene->passes, pass_type, pass_mode);
-
-  /* Fall back to noisy pass if no denoised one is found. */
-  if (pass == nullptr && pass_mode == PassMode::DENOISED) {
-    pass = Pass::find(scene->passes, pass_type, PassMode::NOISY);
-  }
-
-  return get_actual_display_pass(scene, pass);
-}
-
 const Pass *Film::get_actual_display_pass(Scene *scene, const Pass *pass)
 {
   if (!pass) {
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index eee2ace0290..77b4f6145d2 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -83,9 +83,6 @@ class Film : public Node {
 
   /* Get display pass from its name.
    * Will do special logic to replace combined pass with shadow catcher matte. */
-  const Pass *get_actual_display_pass(Scene *scene,
-                                      PassType pass_type,
-                                      PassMode pass_mode = PassMode::NOISY);
   const Pass *get_actual_display_pass(Scene *scene, const Pass *pass);
 
   /* Update passes so that they contain all passes required for the configured functionality.



More information about the Bf-blender-cvs mailing list