[Bf-blender-cvs] [ea35e19f0c3] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: ea35e19f0c3e334eaa92382bfb9969b79d1b6557
Author: Sergey Sharybin
Date:   Thu Aug 26 12:48:38 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBea35e19f0c3e334eaa92382bfb9969b79d1b6557

Merge branch 'master' into cycles-x

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



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

diff --cc intern/cycles/kernel/geom/geom_triangle.h
index a0b3f7ca6c4,ff7909ca425..910fb122c6d
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@@ -115,8 -107,8 +115,8 @@@ triangle_smooth_normal(const KernelGlob
    return is_zero(N) ? Ng : N;
  }
  
- ccl_device_inline float3
- triangle_smooth_normal_unnormalized(const KernelGlobals *kg, float3 Ng, int prim, float u, float v)
+ ccl_device_inline float3 triangle_smooth_normal_unnormalized(
 -    KernelGlobals *kg, ShaderData *sd, float3 Ng, int prim, float u, float v)
++    const KernelGlobals *kg, const ShaderData *sd, float3 Ng, int prim, float u, float v)
  {
    /* load triangle vertices */
    const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, prim);
diff --cc source/blender/blenloader/intern/versioning_300.c
index 3e807069b72,72572b05ef6..172004244c7
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -820,14 -806,17 +820,27 @@@ void blo_do_versions_300(FileData *fd, 
      }
      FOREACH_NODETREE_END;
  
+     /* Disable Fade Inactive Overlay by default as it is redundant after introducing flash on mode
+      * transfer. */
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           if (sl->spacetype == SPACE_VIEW3D) {
+             View3D *v3d = (View3D *)sl;
+             v3d->overlay.flag &= ~V3D_OVERLAY_FADE_INACTIVE;
+           }
+         }
+       }
+     }
++
 +    /* TODO: move to specific subversion when merging into master. */
 +    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
 +      if (ntree->type == NTREE_SHADER) {
 +        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 +          do_version_subsurface_methods(node);
 +        }
 +      }
 +    }
 +    FOREACH_NODETREE_END;
    }
  }