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

[Brecht Van Lommel]

Commit: 7697a045418191d3ac71afaa8707509c6331b1a8
Author: Brecht Van Lommel
Date:   Thu Jun 24 19:47:57 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB7697a045418191d3ac71afaa8707509c6331b1a8

Merge branch 'master' into cycles-x

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



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

diff --cc intern/cycles/kernel/geom/geom_triangle.h
index 66dfaa7e4e7,ebc5abc017a..b82354b2572
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@@ -20,12 -20,10 +20,12 @@@
   * ray intersection we use a precomputed triangle storage to accelerate
   * intersection at the cost of more memory usage */
  
 +#pragma once
 +
  CCL_NAMESPACE_BEGIN
  
- /* normal on triangle  */
+ /* Normal on triangle. */
 -ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd)
 +ccl_device_inline float3 triangle_normal(const KernelGlobals *kg, ShaderData *sd)
  {
    /* load triangle vertices */
    const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, sd->prim);
@@@ -42,15 -40,9 +42,15 @@@
    }
  }
  
- /* point and normal on triangle  */
+ /* Point and normal on triangle. */
 -ccl_device_inline void triangle_point_normal(
 -    KernelGlobals *kg, int object, int prim, float u, float v, float3 *P, float3 *Ng, int *shader)
 +ccl_device_inline void triangle_point_normal(const KernelGlobals *kg,
 +                                             int object,
 +                                             int prim,
 +                                             float u,
 +                                             float v,
 +                                             float3 *P,
 +                                             float3 *Ng,
 +                                             int *shader)
  {
    /* load triangle vertices */
    const uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, prim);