Merge branch 'blender-v2.82-release'

2 files changed, 5 insertions, 0 deletions

diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index 50308d0d377..b08b6c84c1d 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -43,6 +43,8 @@ BufferParams::BufferParams()
   denoising_data_pass = false;
   denoising_clean_pass = false;
   denoising_prefiltered_pass = false;
+
+  Pass::add(PASS_COMBINED, passes);
 }
 
 void BufferParams::get_offset_stride(int &offset, int &stride)
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index bd274844b52..4af0f3c45f0 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -324,9 +324,12 @@ NODE_DEFINE(Film)
 
 Film::Film() : Node(node_type)
 {
+  Pass::add(PASS_COMBINED, passes);
+
   use_light_visibility = false;
   filter_table_offset = TABLE_OFFSET_INVALID;
   cryptomatte_passes = CRYPT_NONE;
+  display_pass = PASS_COMBINED;
 
   need_update = true;
 }