[Bf-blender-cvs] [6f71036b28e] principled-v2: Merge remote-tracking branch 'origin/master' into principled-v2

[Lukas Stockner]

Commit: 6f71036b28e9bfdf6dc71a15b76010e44e1b0e57
Author: Lukas Stockner
Date:   Sat Jul 23 00:28:29 2022 +0200
Branches: principled-v2
https://developer.blender.org/rB6f71036b28e9bfdf6dc71a15b76010e44e1b0e57

Merge remote-tracking branch 'origin/master' into principled-v2

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



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

diff --cc intern/cycles/kernel/types.h
index 80e09805d08,4f4b811a8e7..9cb610503b7
--- a/intern/cycles/kernel/types.h
+++ b/intern/cycles/kernel/types.h
@@@ -1349,15 -1148,8 +1148,16 @@@ typedef enum KernelBVHLayout 
  
  typedef struct KernelTables {
    int beckmann_offset;
+   int filter_table_offset;
 +  int ggx_E_offset;
 +  int ggx_E_avg_offset;
 +  int ggx_clearcoat_E_offset;
 +  int ggx_glass_E_offset;
 +  int ggx_glass_inv_E_offset;
 +  int ggx_dielectric_E_offset;
 +  int ggx_dielectric_inv_E_offset;
 +  int sheen_E_offset;
-   int pad1, pad2, pad3;
+   int pad1, pad2;
  } KernelTables;
  static_assert_align(KernelTables, 16);