Cycles:

* Add alpha pass output, to use set Transparent option in Film panel.
* Add Holdout closure (OSL terminology), this is like the Sky option in the
  internal renderer, objects with this closure show the background / zero
  alpha.
* Add option to use Gaussian instead of Box pixel filter in the UI.
* Remove camera response curves for now, they don't really belong here in
  the pipeline, should be moved to compositor.

* Output full float values for rendering now, previously was only byte precision.
* Add a patch from Thomas to get a preview passes option, but still disabled
  because it isn't quite working right yet.
* CUDA: don't compile shader graph evaluation inline.
* Convert tabs to spaces in python files.

1 files changed, 10 insertions, 5 deletions

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index c0cb3fc8a09..06581d593e4 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -37,6 +37,7 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_OPENCL__
 #define __SVM__
 #define __TEXTURES__
+#define __HOLDOUT__
 #endif
 #define __RAY_DIFFERENTIALS__
 #define __CAMERA_CLIPPING__
@@ -194,8 +195,10 @@ struct FlatClosure {
 enum ShaderDataFlag {
 	SD_BACKFACING = 1,		/* backside of surface? */
 	SD_EMISSION = 2,		/* have emissive closure? */
-	SD_BSDF_HAS_EVAL = 4,	/* have non-singular bsdf closure? */
-	SD_BSDF_GLOSSY = 8		/* have glossy bsdf */
+	SD_BSDF = 4,			/* have bsdf closure? */
+	SD_BSDF_HAS_EVAL = 8,	/* have non-singular bsdf closure? */
+	SD_BSDF_GLOSSY = 16,	/* have glossy bsdf */
+	SD_HOLDOUT = 32			/* have holdout closure? */
 };
 
 typedef struct ShaderData {
@@ -257,6 +260,8 @@ typedef struct ShaderData {
 		float emissive_sample_sum;
 		float volume_sample_sum;
 
+		float3 holdout_weight;
+
 		float randb;
 	} osl_closure;
 
@@ -313,14 +318,14 @@ typedef struct KernelCamera {
 
 typedef struct KernelFilm {
 	float exposure;
-	int use_response_curve;
-	int pad1, pad2;
+	int pad1, pad2, pad3;
 } KernelFilm;
 
 typedef struct KernelBackground {
 	/* only shader index */
 	int shader;
-	int pad1, pad2, pad3;
+	int transparent;
+	int pad1, pad2;
 } KernelBackground;
 
 typedef struct KernelSunSky {