Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
-rw-r--r--intern/cycles/kernel/kernel_types.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index d3012324739..8083da971ed 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -288,14 +288,6 @@ typedef struct KernelCamera {
Transform cameratoworld;
Transform rastertocamera;
- /* depth of field */
- float lensradius;
- float focaldistance;
-
- /* motion blur */
- float shutteropen;
- float shutterclose;
-
/* differentials */
float3 dx;
#ifndef WITH_OPENCL
@@ -306,10 +298,19 @@ typedef struct KernelCamera {
float pad2;
#endif
+ /* depth of field */
+ float aperturesize;
+ float blades;
+ float bladesrotation;
+ float focaldistance;
+
+ /* motion blur */
+ float shutteropen;
+ float shutterclose;
+
/* clipping */
float nearclip;
float cliplength;
- float pad3, pad4;
/* more matrices */
Transform screentoworld;