[Bf-blender-cvs] [d6e34e4825a] cycles_texture_cache: Merge branch 'master' into cycles_texture_cache

[Stefan Werner]

Commit: d6e34e4825ab15ca3573f4e6413387ec8b0a39ba
Author: Stefan Werner
Date:   Mon May 18 10:59:34 2020 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rBd6e34e4825ab15ca3573f4e6413387ec8b0a39ba

Merge branch 'master' into cycles_texture_cache

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



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

diff --cc intern/cycles/kernel/closure/bsdf.h
index a28a69c3778,dc80e67a891..e94f2f40592
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@@ -281,11 -276,9 +279,10 @@@ ccl_device_inline int bsdf_sample(Kerne
                                                       &domega_in->dx,
                                                       &domega_in->dy,
                                                       pdf,
 -                                                     &sd->lcg_state);
 +                                                     &sd->lcg_state,
 +                                                     sd);
        break;
      case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
-     case CLOSURE_BSDF_MICROFACET_BECKMANN_ANISO_ID:
      case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
        label = bsdf_microfacet_beckmann_sample(kg,
                                                sc,
@@@ -299,11 -292,9 +296,10 @@@
                                                omega_in,
                                                &domega_in->dx,
                                                &domega_in->dy,
 -                                              pdf);
 +                                              pdf,
 +                                              sd);
        break;
      case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID:
-     case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID:
        label = bsdf_ashikhmin_shirley_sample(sc,
                                              sd->Ng,
                                              sd->I,