From b17cca6966dd06be5fc66a5c1ece79bbfe6b39b7 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 22 Sep 2020 13:52:38 +0200 Subject: Fix T81026: Image Editor: Alpha (like Bloom) not showing properly With the new image editor drawing there were was some mutual exclusive functionality. When rendering the alpha was shown correctly or the pure emissive colors were shown correctly, but never both. The cause of this is that the image_gpu did not used the correct alpha mode when generating gpu textures for non-images (render results, compositors viewer) The implementation always checked the alpha_mode. Alpha mode is an attribute for images, but aren't set for non images. This patch adds a more detailed check to ensure that the gpu texture is premultiplied. The issue has been tested using several bug report files and production files. Reviewed By: Brecht van Lommel Differential Revision: https://developer.blender.org/D8978 --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/datafiles/locale b/release/datafiles/locale index 2b3c19f5f61..07106b58838 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 2b3c19f5f61fc72dba56a7edfdc4e55e2327dc1f +Subproject commit 07106b588381ef26604934482a6151d9bc26437e diff --git a/release/scripts/addons b/release/scripts/addons index 1f043682f95..1be0b3210d8 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 1f043682f9568fed02e3b877b31e8244b1b7a5c2 +Subproject commit 1be0b3210d8a3a30e99a853b50703a7ca7e8ac1e diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index a52733b58d9..f2f4a8b3bfa 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit a52733b58d95ce60ecde95a9eca242e7319c285a +Subproject commit f2f4a8b3bfa36ee49f7bdb3a1acb40ef4b39ee3a -- cgit v1.2.3