[Bf-blender-cvs] [2489f72d794] master: Revert "EEVEE: AOVs not same as cycles."

[Jeroen Bakker]

Commit: 2489f72d79401fdefa6cf70d5acde806096b7b4a
Author: Jeroen Bakker
Date:   Wed Jun 2 16:56:10 2021 +0200
Branches: master
https://developer.blender.org/rB2489f72d79401fdefa6cf70d5acde806096b7b4a

Revert "EEVEE: AOVs not same as cycles."

This reverts commit 730a46e87d261543c9550ddef406894e14d5bea6.

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

M	release/scripts/addons
M	source/blender/draw/engines/eevee/eevee_renderpasses.c
M	source/blender/nodes/shader/nodes/node_shader_output_aov.c

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

diff --git a/release/scripts/addons b/release/scripts/addons
index cdabac54c4f..27fe7f3a4f9 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit cdabac54c4fe7c6f8df125814442762aa539172b
+Subproject commit 27fe7f3a4f964b53af436c4da4ddea337eff0c7e
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c
index 5ada53ab98c..5739024993e 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.c
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c
@@ -79,7 +79,7 @@ bool EEVEE_renderpasses_only_first_sample_pass_active(EEVEE_Data *vedata)
  * type the rest of the bits are used for the name hash. */
 int EEVEE_renderpasses_aov_hash(const ViewLayerAOV *aov)
 {
-  int hash = BLI_hash_string(aov->name) << 1;
+  int hash = BLI_hash_string(aov->name);
   SET_FLAG_FROM_TEST(hash, aov->type == AOV_TYPE_COLOR, EEVEE_AOV_HASH_COLOR_TYPE_MASK);
   return hash;
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_aov.c b/source/blender/nodes/shader/nodes/node_shader_output_aov.c
index 7e7e1b703f1..403b3e6d9d6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_aov.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_aov.c
@@ -43,9 +43,8 @@ static int node_shader_gpu_output_aov(GPUMaterial *mat,
 {
   GPUNodeLink *outlink;
   NodeShaderOutputAOV *aov = (NodeShaderOutputAOV *)node->storage;
-  /* Keep in sync with `renderpass_lib.glsl#render_pass_aov_hash` and
-   * `EEVEE_renderpasses_aov_hash`. */
-  unsigned int hash = BLI_hash_string(aov->name) << 1;
+  /* Keep in sync with `renderpass_lib.glsl#render_pass_aov_hash`. */
+  unsigned int hash = BLI_hash_string(aov->name) & ~1;
   GPU_stack_link(mat, node, "node_output_aov", in, out, &outlink);
   GPU_material_add_output_link_aov(mat, outlink, hash);