[Bf-blender-cvs] [646f7ef73ce] master: Render: disable Z pass by default, leave only Combined

[Brecht Van Lommel]

Commit: 646f7ef73ce647b0384ca9491ec8cbfacc38ab54
Author: Brecht Van Lommel
Date:   Thu Jul 29 16:31:10 2021 +0200
Branches: master
https://developer.blender.org/rB646f7ef73ce647b0384ca9491ec8cbfacc38ab54

Render: disable Z pass by default, leave only Combined

It was somewhat arbitrary to have this one pass enabled that adds a bit of
additional memory and render time overhead, even though it's not necessarily
more important than others.

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

M	source/blender/blenkernel/intern/layer.c
M	source/blender/blenloader/intern/versioning_defaults.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 262950bfab5..5322eef6d5e 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -180,7 +180,7 @@ static ViewLayer *view_layer_add(const char *name)
 
   /* Pure rendering pipeline settings. */
   view_layer->layflag = 0x7FFF; /* solid ztra halo edge strand */
-  view_layer->passflag = SCE_PASS_COMBINED | SCE_PASS_Z;
+  view_layer->passflag = SCE_PASS_COMBINED;
   view_layer->pass_alpha_threshold = 0.5f;
   view_layer->cryptomatte_levels = 6;
   view_layer->cryptomatte_flag = VIEW_LAYER_CRYPTOMATTE_ACCURATE;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 6b54600f915..1bbb22eb323 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -318,6 +318,11 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
   /* Rename render layers. */
   BKE_view_layer_rename(bmain, scene, scene->view_layers.first, "View Layer");
 
+  /* Disable Z pass by default. */
+  LISTBASE_FOREACH (ViewLayer *, view_layer, &scene->view_layers) {
+    view_layer->passflag &= ~SCE_PASS_Z;
+  }
+
   /* New EEVEE defaults. */
   scene->eevee.bloom_intensity = 0.05f;
   scene->eevee.bloom_clamp = 0.0f;