diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-21 14:47:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-21 14:47:13 +0300 |
commit | cac2415d829aca6f4d0b6f497c08c7d18efd5853 (patch) | |
tree | 9557e237c596454095e5a23fb58a1e026b0573c5 /intern | |
parent | f3efa2526d86bcc398931a4b148549225ce8123b (diff) | |
parent | 23ffd4ec394011cec26879cba946501b245020fd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 11657003259..2945cdb4593 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1462,6 +1462,7 @@ typedef struct KernelSpotLight { float spot_angle; float spot_smooth; float dir[3]; + float pad; } KernelSpotLight; /* PointLight is SpotLight with only radius and invarea being used. */ @@ -1470,13 +1471,16 @@ typedef struct KernelAreaLight { float axisu[3]; float invarea; float axisv[3]; + float pad1; float dir[3]; + float pad2; } KernelAreaLight; typedef struct KernelDistantLight { float radius; float cosangle; float invarea; + float pad; } KernelDistantLight; typedef struct KernelLight { |