diff options
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 20 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index eec13d04d7d..6e9964e8bc3 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -449,11 +449,11 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_) BL::Object b_camera_override(b_engine.camera_override()); sync->sync_camera(b_render, b_camera_override, width, height, b_rview_name.c_str()); sync->sync_data(b_render, - b_depsgraph, - b_v3d, - b_camera_override, - width, height, - &python_thread_state); + b_depsgraph, + b_v3d, + b_camera_override, + width, height, + &python_thread_state); builtin_images_load(); /* Make sure all views have different noise patterns. - hardcoded value just to make it random */ @@ -610,11 +610,11 @@ void BlenderSession::bake(BL::Depsgraph& b_depsgraph_, BL::Object b_camera_override(b_engine.camera_override()); sync->sync_camera(b_render, b_camera_override, width, height, ""); sync->sync_data(b_render, - b_depsgraph, - b_v3d, - b_camera_override, - width, height, - &python_thread_state); + b_depsgraph, + b_v3d, + b_camera_override, + width, height, + &python_thread_state); builtin_images_load(); } diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 0c27786f241..80aa68d9756 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -177,7 +177,7 @@ void BlenderSync::sync_recalc(BL::Depsgraph& b_depsgraph) } void BlenderSync::sync_data(BL::RenderSettings& b_render, - BL::Depsgraph& b_depsgraph, + BL::Depsgraph& b_depsgraph, BL::SpaceView3D& b_v3d, BL::Object& b_override, int width, int height, |