[Bf-blender-cvs] [908eda87efc] tmp-eevee-aov: Merge branch 'master' into tmp-eevee-aov

[Jeroen Bakker]

Commit: 908eda87efc7a682c363e11038c76d9b6ca513fb
Author: Jeroen Bakker
Date:   Wed Oct 21 14:40:28 2020 +0200
Branches: tmp-eevee-aov
https://developer.blender.org/rB908eda87efc7a682c363e11038c76d9b6ca513fb

Merge branch 'master' into tmp-eevee-aov

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



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

diff --cc source/blender/draw/engines/eevee/eevee_render.c
index a113a4c1f59,504e4e1d336..32e6eac2402
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@@ -705,19 -675,6 +705,22 @@@ void EEVEE_render_update_passes(RenderE
    CHECK_PASS_EEVEE(VOLUME_TRANSMITTANCE, SOCK_RGBA, 3, "RGB");
    CHECK_PASS_EEVEE(BLOOM, SOCK_RGBA, 3, "RGB");
  
 +  LISTBASE_FOREACH (ViewLayerAOV *, aov, &view_layer->aovs) {
++    if ((aov->flag & AOV_CONFLICT) != 0) {
++      continue;
++    }
 +    switch (aov->type) {
 +      case AOV_TYPE_COLOR:
-         RE_engine_register_pass(engine, scene, view_layer, aov->name, 3, "RGB", SOCK_RGBA);
++        RE_engine_register_pass(engine, scene, view_layer, aov->name, 4, "RGBA", SOCK_RGBA);
 +        break;
 +      case AOV_TYPE_VALUE:
 +        RE_engine_register_pass(engine, scene, view_layer, aov->name, 1, "X", SOCK_FLOAT);
 +        break;
 +      default:
 +        break;
 +    }
 +  }
 +
  #undef CHECK_PASS_LEGACY
  #undef CHECK_PASS_EEVEE
  }
diff --cc source/blender/makesrna/RNA_access.h
index dcf7b71c8ea,6dfd7b0fdf5..63342096467
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -705,9 -707,10 +707,11 @@@ extern StructRNA RNA_View3DCursor
  extern StructRNA RNA_View3DOverlay;
  extern StructRNA RNA_View3DShading;
  extern StructRNA RNA_ViewLayer;
 +extern StructRNA RNA_ViewLayerAOV;
  extern StructRNA RNA_ViewLayerEEVEE;
  extern StructRNA RNA_Volume;
+ extern StructRNA RNA_VolumeDisplaceModifier;
+ extern StructRNA RNA_VolumeToMeshModifier;
  extern StructRNA RNA_VoronoiTexture;
  extern StructRNA RNA_WalkNavigation;
  extern StructRNA RNA_WarpModifier;