[Bf-blender-cvs] [4f8f0f3208b] blender-v2.82-release: Fix issues in Cycles standalone, particularly related to render display

[Brecht Van Lommel]

Commit: 4f8f0f3208b51fd2c599917415dcfaa3cf424d5f
Author: Brecht Van Lommel
Date:   Fri Jan 31 15:23:17 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB4f8f0f3208b51fd2c599917415dcfaa3cf424d5f

Fix issues in Cycles standalone, particularly related to render display

Some code was removed to avoid storing the combined pass when viewport
rendering other passes. But we can keep this by default, Blender overrides
the list of passes entirely.

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

M	intern/cycles/render/buffers.cpp
M	intern/cycles/render/film.cpp
M	intern/cycles/util/util_view.cpp

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

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;
 }
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp
index f23174fd6dc..9d9ff451b3b 100644
--- a/intern/cycles/util/util_view.cpp
+++ b/intern/cycles/util/util_view.cpp
@@ -134,7 +134,7 @@ static void view_display()
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  gluOrtho2D(0, V.width, 0, V.height);
+  glOrtho(0, V.width, 0, V.height, -1, 1);
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();