svn merge ^/trunk/blender -r44118:44136

2012-02-15 18:32:08 +00:00
parent 576ce5928f 93526b4c72
commit 78f9bb6e91
8 changed files with 6239 additions and 6162 deletions
--- 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 {