diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-08-05 16:12:43 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-05 17:32:13 +0300 |
commit | 43a124bc1c4a2e096a6a81224fc318ac8f9180a4 (patch) | |
tree | f2a7eae00e49a65d86c42a52c3b843bb85d3b03c /intern/cycles/blender | |
parent | fa514564b0c3ec4769c814c2bee587ce9e386571 (diff) |
Fix T99179: holdout does not affect transparency without transparent background
This was by design, but maybe not so useful in practice. It's always possible to
set alpha to 1 in compositing if needed.
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/display_driver.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp index a1bc064be68..61cd88fb433 100644 --- a/intern/cycles/blender/display_driver.cpp +++ b/intern/cycles/blender/display_driver.cpp @@ -913,8 +913,6 @@ void BlenderDisplayDriver::flush() void BlenderDisplayDriver::draw(const Params ¶ms) { /* See do_update_begin() for why no locking is required here. */ - const bool transparent = true; // TODO(sergey): Derive this from Film. - if (use_gl_context_) { gl_context_mutex_.lock(); } @@ -935,10 +933,8 @@ void BlenderDisplayDriver::draw(const Params ¶ms) glWaitSync((GLsync)gl_upload_sync_, 0, GL_TIMEOUT_IGNORED); } - if (transparent) { - glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - } + glEnable(GL_BLEND); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glActiveTexture(GL_TEXTURE0); @@ -975,9 +971,7 @@ void BlenderDisplayDriver::draw(const Params ¶ms) glDeleteVertexArrays(1, &vertex_array_object); - if (transparent) { - glDisable(GL_BLEND); - } + glDisable(GL_BLEND); gl_render_sync_ = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); glFlush(); |