[Bf-blender-cvs] [d6d36b98923] master: Cycles: Cleanup, remove unused argument

[Sergey Sharybin]

Commit: d6d36b98923bc360d338794ebc23e824b5a69380
Author: Sergey Sharybin
Date:   Mon Jun 24 14:42:20 2019 +0200
Branches: master
https://developer.blender.org/rBd6d36b98923bc360d338794ebc23e824b5a69380

Cycles: Cleanup, remove unused argument

Became obsolete/unused after recent fix.

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

M	intern/cycles/blender/blender_session.cpp
M	intern/cycles/blender/blender_session.h

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 126b6ad25be..dcbb101b01d 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -361,14 +361,14 @@ void BlenderSession::do_write_update_render_tile(RenderTile &rtile,
     bool merge = (rtile.sample != 0) && (rtile.task != RenderTile::DENOISE);
 
     if (merge) {
-      update_render_result(b_rr, b_rlay, rtile);
+      update_render_result(b_rlay, rtile);
     }
 
     end_render_result(b_engine, b_rr, true, highlight, merge);
   }
   else {
     /* Write final render result. */
-    write_render_result(b_rr, b_rlay, rtile);
+    write_render_result(b_rlay, rtile);
     end_render_result(b_engine, b_rr, false, false, true);
   }
 }
@@ -765,8 +765,7 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
   sync = NULL;
 }
 
-void BlenderSession::do_write_update_render_result(BL::RenderResult &b_rr,
-                                                   BL::RenderLayer &b_rlay,
+void BlenderSession::do_write_update_render_result(BL::RenderLayer &b_rlay,
                                                    RenderTile &rtile,
                                                    bool do_update_only)
 {
@@ -827,18 +826,14 @@ void BlenderSession::do_write_update_render_result(BL::RenderResult &b_rr,
   }
 }
 
-void BlenderSession::write_render_result(BL::RenderResult &b_rr,
-                                         BL::RenderLayer &b_rlay,
-                                         RenderTile &rtile)
+void BlenderSession::write_render_result(BL::RenderLayer &b_rlay, RenderTile &rtile)
 {
-  do_write_update_render_result(b_rr, b_rlay, rtile, false);
+  do_write_update_render_result(b_rlay, rtile, false);
 }
 
-void BlenderSession::update_render_result(BL::RenderResult &b_rr,
-                                          BL::RenderLayer &b_rlay,
-                                          RenderTile &rtile)
+void BlenderSession::update_render_result(BL::RenderLayer &b_rlay, RenderTile &rtile)
 {
-  do_write_update_render_result(b_rr, b_rlay, rtile, true);
+  do_write_update_render_result(b_rlay, rtile, true);
 }
 
 void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_)
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index b93273e32ae..d57ebe76b82 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -70,12 +70,12 @@ class BlenderSession {
             const int depth,
             float pixels[]);
 
-  void write_render_result(BL::RenderResult &b_rr, BL::RenderLayer &b_rlay, RenderTile &rtile);
+  void write_render_result(BL::RenderLayer &b_rlay, RenderTile &rtile);
   void write_render_tile(RenderTile &rtile);
 
   /* update functions are used to update display buffer only after sample was rendered
    * only needed for better visual feedback */
-  void update_render_result(BL::RenderResult &b_rr, BL::RenderLayer &b_rlay, RenderTile &rtile);
+  void update_render_result(BL::RenderLayer &b_rlay, RenderTile &rtile);
   void update_render_tile(RenderTile &rtile, bool highlight);
 
   /* interactive updates */
@@ -150,8 +150,7 @@ class BlenderSession {
  protected:
   void stamp_view_layer_metadata(Scene *scene, const string &view_layer_name);
 
-  void do_write_update_render_result(BL::RenderResult &b_rr,
-                                     BL::RenderLayer &b_rlay,
+  void do_write_update_render_result(BL::RenderLayer &b_rlay,
                                      RenderTile &rtile,
                                      bool do_update_only);
   void do_write_update_render_tile(RenderTile &rtile, bool do_update_only, bool highlight);