diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-13 20:24:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-13 20:26:52 +0300 |
commit | 711a50c5ea4de65be1512a1dbfa82b83ef993f56 (patch) | |
tree | c068e22657942f7a9cb8777e74a46ff54a111f5d /source/blender/draw | |
parent | a3c630aebb34e88de3a4820a0bb0f4359e13570d (diff) | |
parent | 4d58fac1b4ddcf424d78ee96b404445e8ccc6527 (diff) |
Merge branch 'master' into blender2.8
This includes making Eevee match Cycles behavior of inserting an emission
node when linking colors to closures.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl index a1890433b0f..8b232bf14a4 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl @@ -666,6 +666,13 @@ Closure closure_add(Closure cl1, Closure cl2) return cl; } +Closure closure_emission(vec3 rgb) +{ + Closure cl = CLOSURE_DEFAULT; + cl.emission = rgb; + return cl; +} + #else /* VOLUMETRICS */ struct Closure { @@ -767,6 +774,13 @@ Closure closure_add(Closure cl1, Closure cl2) return cl; } +Closure closure_emission(vec3 rgb) +{ + Closure cl = CLOSURE_DEFAULT; + cl.radiance = rgb; + return cl; +} + # if defined(MESH_SHADER) && !defined(USE_ALPHA_HASH) && !defined(USE_ALPHA_CLIP) && !defined(SHADOW_SHADER) && !defined(USE_MULTIPLY) layout(location = 0) out vec4 fragColor; layout(location = 1) out vec4 ssrNormals; |