Commit: 4627fe1465a85ed5ce06b0f5a1ccaaacfbd371bb Author: Sergey Sharybin Date: Wed May 26 11:26:11 2021 +0200 Branches: cycles-x https://developer.blender.org/rB4627fe1465a85ed5ce06b0f5a1ccaaacfbd371bb
Merge branch 'master' into cycles-x =================================================================== =================================================================== diff --cc intern/cycles/blender/blender_sync.cpp index 42c7bf5f351,bacf57df48e..00b37a2ab44 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@@ -226,8 -224,18 +226,17 @@@ void BlenderSync::sync_recalc(BL::Depsg if (b_v3d) { BlenderViewportParameters new_viewport_parameters(b_v3d); + if (viewport_parameters.modified(new_viewport_parameters)) { world_recalc = true; + has_updates_ = true; + } + + 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 = BlenderViewportParameters::get_render_pass(b_v3d); + has_updates_ |= film->get_display_pass() != new_display_pass; } } } @@@ -248,13 -256,9 +257,13 @@@ void BlenderSync::sync_data(BL::RenderS BL::ViewLayer b_view_layer = b_depsgraph.view_layer_eval(); + /* TODO(sergey): This feels weak to pass view layer to the integrator, and even weaker to have an + * implicit check on whether it is a background render or not. What is the nicer thing here? */ + const bool background = !b_v3d; + - sync_view_layer(b_v3d, b_view_layer); + sync_view_layer(b_view_layer); - sync_integrator(); - sync_film(b_v3d); + sync_integrator(b_view_layer, background); + sync_film(b_view_layer, b_v3d); sync_shaders(b_depsgraph, b_v3d); sync_images(); diff --cc intern/cycles/blender/blender_sync.h index c417d5e35c9,8cd65f13f70..293c20dd359 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@@ -74,9 -73,13 +74,9 @@@ class BlenderSync int width, int height, void **python_thread_state); - void sync_view_layer(BL::SpaceView3D &b_v3d, BL::ViewLayer &b_view_layer); + void sync_view_layer(BL::ViewLayer &b_view_layer); - vector<Pass> sync_render_passes(BL::Scene &b_scene, - BL::RenderLayer &b_render_layer, - BL::ViewLayer &b_view_layer, - bool adaptive_sampling, - const DenoiseParams &denoising); - void sync_integrator(); + void sync_render_passes(BL::RenderLayer &b_render_layer, BL::ViewLayer &b_view_layer); + void sync_integrator(BL::ViewLayer &b_view_layer, bool background); void sync_camera(BL::RenderSettings &b_render, BL::Object &b_override, int width, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs