[Bf-blender-cvs] [d4f6d7850b8] tmp-eevee-aov: Fix AO Render Pass selection in 3D Viewport

[Jeroen Bakker]

Commit: d4f6d7850b8295659f95baf8f9cf033697ac2778
Author: Jeroen Bakker
Date:   Thu Sep 24 16:22:17 2020 +0200
Branches: tmp-eevee-aov
https://developer.blender.org/rBd4f6d7850b8295659f95baf8f9cf033697ac2778

Fix AO Render Pass selection in 3D Viewport

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

M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 7f07ead460b..bb6a593c5ba 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1388,9 +1388,6 @@ static void rna_3DViewShading_render_pass_set(PointerRNA *ptr, int value)
     shading->render_pass = EEVEE_RENDER_PASS_AOV;
     BLI_strncpy(shading->aov_name, aov->name, sizeof(aov->name));
   }
-  else if (value == EEVEE_RENDER_PASS_AO && ((scene->eevee.flag & SCE_EEVEE_GTAO_ENABLED) == 0)) {
-    shading->render_pass = EEVEE_RENDER_PASS_COMBINED;
-  }
   else if (value == EEVEE_RENDER_PASS_BLOOM &&
            ((scene->eevee.flag & SCE_EEVEE_BLOOM_ENABLED) == 0)) {
     shading->render_pass = EEVEE_RENDER_PASS_COMBINED;