[Bf-blender-cvs] [7c0204c6d57] temp-cycles-denoising: Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

[Lukas Stockner]

Commit: 7c0204c6d5739cf202afb5d14c5f7a8a1a0c57a6
Author: Lukas Stockner
Date:   Mon Apr 24 22:17:45 2017 +0200
Branches: temp-cycles-denoising
https://developer.blender.org/rB7c0204c6d5739cf202afb5d14c5f7a8a1a0c57a6

Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

===================================================================



===================================================================

diff --cc intern/cycles/kernel/svm/svm_types.h
index be99777dfb5,cc9b840b13f..d859cae1708
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@@ -470,9 -471,7 +470,9 @@@ typedef enum ClosureType 
  #define CLOSURE_IS_BSDF_ANISOTROPIC(type) (type >= CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID && type <= CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID)
  #define CLOSURE_IS_BSDF_MULTISCATTER(type) (type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID ||\
                                              type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_ANISO_ID || \
- 											type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID)
+                                             type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID)
 +#define CLOSURE_IS_BSDF_MICROFACET(type) ((type >= CLOSURE_BSDF_REFLECTION_ID && type <= CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID) ||\
 +                                          (type >= CLOSURE_BSDF_REFRACTION_ID && type <= CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID))
  #define CLOSURE_IS_BSDF_OR_BSSRDF(type) (type <= CLOSURE_BSSRDF_BURLEY_ID)
  #define CLOSURE_IS_BSSRDF(type) (type >= CLOSURE_BSSRDF_CUBIC_ID && type <= CLOSURE_BSSRDF_BURLEY_ID)
  #define CLOSURE_IS_VOLUME(type) (type >= CLOSURE_VOLUME_ID && type <= CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID)