[Bf-blender-cvs] [6d475c81245] cycles_procedural_api: revert some unnecessary changes

[Kévin Dietrich]

Commit: 6d475c812456b6947ca320da31975467d51d4f3d
Author: Kévin Dietrich
Date:   Fri Nov 13 12:03:44 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB6d475c812456b6947ca320da31975467d51d4f3d

revert some unnecessary changes

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

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

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 5393ee3695b..e2521cd86a0 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -246,7 +246,8 @@ void BlenderSession::reset_session(BL::BlendData &b_data, BL::Depsgraph &b_depsg
     sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress);
   }
   else {
-    sync->sync_recalc(b_depsgraph, nullptr);
+    /* b_v3d should be null here, sync_recalc will check for nullity */
+    sync->sync_recalc(b_depsgraph, b_v3d);
   }
 
   BL::SpaceView3D b_null_space_view3d(PointerRNA_NULL);
@@ -817,7 +818,7 @@ void BlenderSession::synchronize(BL::Depsgraph &b_depsgraph_)
 
   /* copy recalc flags, outside of mutex so we can decide to do the real
    * synchronization at a later time to not block on running updates */
-  sync->sync_recalc(b_depsgraph_, &b_v3d);
+  sync->sync_recalc(b_depsgraph_, b_v3d);
 
   /* don't do synchronization if on pause */
   if (session_pause) {
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 8b8f1579ab7..53b398ba6dc 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -92,7 +92,7 @@ void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene)
 
 /* Sync */
 
-void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D *b_v3d)
+void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d)
 {
   /* Sync recalc flags from blender to cycles. Actual update is done separate,
    * so we can do it later on if doing it immediate is not suitable. */
@@ -214,7 +214,7 @@ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D *b_v3d
   }
 
   if (b_v3d) {
-    BlenderViewportParameters new_viewport_parameters(*b_v3d);
+    BlenderViewportParameters new_viewport_parameters(b_v3d);
     if (viewport_parameters.modified(new_viewport_parameters)) {
       world_recalc = true;
     }
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 900870f2db4..7fc2d05ad9b 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -65,7 +65,7 @@ class BlenderSync {
   void reset(BL::BlendData &b_data, BL::Scene &b_scene);
 
   /* sync */
-  void sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D *b_v3d);
+  void sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d);
   void sync_data(BL::RenderSettings &b_render,
                  BL::Depsgraph &b_depsgraph,
                  BL::SpaceView3D &b_v3d,