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.
This commit is contained in:
Brecht Van Lommel 2020-01-31 15:23:17 +01:00
parent aa81a05de8
commit 4f8f0f3208
3 changed files with 6 additions and 1 deletions

View File

@ -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)

View File

@ -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;
}

View File

@ -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();