[Bf-blender-cvs] [bf7a67c5c63] master: Refactor: Rename pass accessor in viewport parameters

[Sergey Sharybin]

Commit: bf7a67c5c63d02f1736dcb254c493620c5d98d91
Author: Sergey Sharybin
Date:   Thu May 27 10:42:22 2021 +0200
Branches: master
https://developer.blender.org/rBbf7a67c5c63d02f1736dcb254c493620c5d98d91

Refactor: Rename pass accessor in viewport parameters

No need to state that it is a viewport display pass, since the method
is within viewport parameters it is implied that parameters do belong
to the viewport.

Brings this code closer to the Cycles-X branch.

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

M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/blender/blender_viewport.cpp
M	intern/cycles/blender/blender_viewport.h

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index bacf57df48e..e6e0fb54457 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -233,8 +233,7 @@ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d
     if (!has_updates_) {
       Film *film = scene->film;
 
-      const PassType new_display_pass = new_viewport_parameters.get_viewport_display_render_pass(
-          b_v3d);
+      const PassType new_display_pass = new_viewport_parameters.get_render_pass(b_v3d);
       has_updates_ |= film->get_display_pass() != new_display_pass;
     }
   }
diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp
index aac3d41314a..99dbde91858 100644
--- a/intern/cycles/blender/blender_viewport.cpp
+++ b/intern/cycles/blender/blender_viewport.cpp
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "blender_viewport.h"
 
 #include "blender_util.h"
@@ -70,7 +71,7 @@ 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 BlenderViewportParameters::get_render_pass(BL::SpaceView3D &b_v3d)
 {
   PassType display_pass = PASS_NONE;
   if (b_v3d) {
@@ -84,7 +85,7 @@ PassType BlenderViewportParameters::get_viewport_display_render_pass(BL::SpaceVi
 PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d, vector<Pass> &passes)
 {
   if (b_v3d) {
-    PassType display_pass = BlenderViewportParameters::get_viewport_display_render_pass(b_v3d);
+    PassType display_pass = BlenderViewportParameters::get_render_pass(b_v3d);
 
     passes.clear();
     Pass::add(display_pass, passes);
diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h
index 7c6c9c4d274..5939076979a 100644
--- a/intern/cycles/blender/blender_viewport.h
+++ b/intern/cycles/blender/blender_viewport.h
@@ -44,9 +44,9 @@ class BlenderViewportParameters {
   friend class BlenderSync;
 
  public:
-  /* Retrieve the render pass that needs to be displayed on the given `SpaceView3D`
+  /* Retrieve the render pass type that needs to be displayed on the given `SpaceView3D`
    * When the `b_v3d` parameter is not given `PASS_NONE` will be returned. */
-  static PassType get_viewport_display_render_pass(BL::SpaceView3D &b_v3d);
+  static PassType get_render_pass(BL::SpaceView3D &b_v3d);
 };
 
 PassType update_viewport_display_passes(BL::SpaceView3D &b_v3d, vector<Pass> &passes);