Merge branch 'blender2.7'
[blender.git] / intern / cycles / render / film.cpp
index 355294e..1d1668a 100644 (file)
@@ -286,6 +286,7 @@ NODE_DEFINE(Film)
 
        SOCKET_BOOLEAN(denoising_data_pass,  "Generate Denoising Data Pass",  false);
        SOCKET_BOOLEAN(denoising_clean_pass, "Generate Denoising Clean Pass", false);
+       SOCKET_BOOLEAN(denoising_prefiltered_pass, "Generate Denoising Prefiltered Pass", false);
        SOCKET_INT(denoising_flags, "Denoising Flags", 0);
 
        return type;
@@ -478,6 +479,9 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
                        kfilm->pass_stride += DENOISING_PASS_SIZE_CLEAN;
                        kfilm->use_light_pass = 1;
                }
+               if(denoising_prefiltered_pass) {
+                       kfilm->pass_stride += DENOISING_PASS_SIZE_PREFILTERED;
+               }
        }
 
        kfilm->pass_stride = align_up(kfilm->pass_stride, 4);