[Bf-blender-cvs] [ff7401b02c4] master: Fix T64214 Eevee: Issue with Emission node and Alpha blending

Clément Foucault noreply at git.blender.org
Tue Jun 4 18:43:06 CEST 2019


Commit: ff7401b02c4b9e111c0632f33bf5b51fc63026f6
Author: Clément Foucault
Date:   Tue Jun 4 12:52:00 2019 +0200
Branches: master
https://developer.blender.org/rBff7401b02c4b9e111c0632f33bf5b51fc63026f6

Fix T64214 Eevee: Issue with Emission node and Alpha blending

Emission node was outputing alpha information but is was not
supposed to. Match cycles reference.

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

M	source/blender/gpu/shaders/gpu_shader_material.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 7f37e741591..3b1ad41ad95 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1797,14 +1797,12 @@ void node_wireframe_screenspace(float size, vec2 barycentric, out float fac)
 
 void node_emission(vec4 color, float strength, vec3 vN, out Closure result)
 {
-#ifndef VOLUMETRICS
-  color *= strength;
   result = CLOSURE_DEFAULT;
-  result.radiance = color.rgb;
-  result.opacity = color.a;
+#ifndef VOLUMETRICS
+  result.radiance = color.rgb * strength;
   result.ssr_normal = normal_encode(vN, viewCameraVec);
 #else
-  result = Closure(vec3(0.0), vec3(0.0), color.rgb * strength, 0.0);
+  result.emission = color.rgb * strength;
 #endif
 }



More information about the Bf-blender-cvs mailing list