diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-05-26 12:16:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-08-17 21:30:22 +0300 |
commit | 8b80d19f3641b7f09745b8d50433dda213864e50 (patch) | |
tree | 098056654e26badc83264805e68c557eb6a7ff50 | |
parent | 9fca86d5494e752316d0ed60c06ccff36de53e58 (diff) |
Fix T88552: Cycles changing Render Passes in viewport does not workv2.93.3
Backporting this fixes T90599.
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 9d0f9f29f94..3e8a7f8bb53 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -224,8 +224,18 @@ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d 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); + has_updates_ |= film->get_display_pass() != new_display_pass; } } } |