diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 22:32:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 22:32:08 +0400 |
| commit | 78f9bb6e913c6c87080c9bf1a91712d83a415154 (patch) | |
| tree | 4dd8f90a0b0c37cfab7ed98195809bbff8348be6 /intern/cycles | |
| parent | 576ce5928f184b4f78dc0b48fdb8726cf320047b (diff) | |
| parent | 93526b4c72f76f8d8d382a11e7d0f8e4f21c4a7c (diff) | |
svn merge ^/trunk/blender -r44118:44136
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 477b08f2f87..00635282202 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -450,6 +450,8 @@ typedef struct KernelFilm { int pass_emission; int pass_background; + int pass_pad1; + int pass_pad2; } KernelFilm; typedef struct KernelBackground { @@ -499,6 +501,7 @@ typedef struct KernelIntegrator { /* render layer */ int layer_flag; + int pad1, pad2, pad3; } KernelIntegrator; typedef struct KernelBVH { |