[Bf-blender-cvs] [73948979c82] cycles_procedural_api: Merge branch 'master' into cycles_procedural_api

[Kévin Dietrich]

Commit: 73948979c82214f1f39e040dc41fb2c83b08f9ac
Author: Kévin Dietrich
Date:   Mon Sep 21 11:33:37 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB73948979c82214f1f39e040dc41fb2c83b08f9ac

Merge branch 'master' into cycles_procedural_api

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



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

diff --cc intern/cycles/blender/blender_sync.cpp
index 78cc248556a,ec62fa63f73..ebf83bd752c
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -581,8 -590,10 +590,10 @@@ vector<Pass> BlenderSync::sync_render_p
    if (denoising.use || denoising.store_passes) {
      if (denoising.type == DENOISER_NLM) {
  #define MAP_OPTION(name, flag) \
-   if (!get_boolean(crl, name)) \
-     denoising_flags |= flag;
+   if (!get_boolean(crl, name)) { \
 -    scene->film->denoising_flags |= flag; \
++    denoising_flags |= flag; \
+   } \
+   ((void)0)
        MAP_OPTION("denoising_diffuse_direct", DENOISING_CLEAN_DIFFUSE_DIR);
        MAP_OPTION("denoising_diffuse_indirect", DENOISING_CLEAN_DIFFUSE_IND);
        MAP_OPTION("denoising_glossy_direct", DENOISING_CLEAN_GLOSSY_DIR);
diff --cc intern/cycles/render/nodes.h
index a632ca65bf2,62dd9d843a8..398e68ba472
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@@ -619,36 -570,19 +619,37 @@@ class PrincipledBsdfNode : public BsdfB
                 ShaderInput *anisotropic_rotation,
                 ShaderInput *transmission_roughness);
  
 -  float3 base_color;
 -  float3 subsurface_color, subsurface_radius;
 -  float metallic, subsurface, specular, roughness, specular_tint, anisotropic, sheen, sheen_tint,
 -      clearcoat, clearcoat_roughness, ior, transmission, anisotropic_rotation,
 -      transmission_roughness;
 -  float3 normal, clearcoat_normal, tangent;
 -  float surface_mix_weight;
 -  ClosureType distribution, distribution_orig;
 -  ClosureType subsurface_method;
 -  float3 emission;
 -  float emission_strength;
 -  float alpha;
 +  NODE_PUBLIC_API(float3, base_color)
 +  NODE_PUBLIC_API(float3, subsurface_color)
 +  NODE_PUBLIC_API(float3, subsurface_radius)
 +  NODE_PUBLIC_API(float, metallic)
 +  NODE_PUBLIC_API(float, subsurface)
 +  NODE_PUBLIC_API(float, specular)
 +  NODE_PUBLIC_API(float, roughness)
 +  NODE_PUBLIC_API(float, specular_tint)
 +  NODE_PUBLIC_API(float, anisotropic)
 +  NODE_PUBLIC_API(float, sheen)
 +  NODE_PUBLIC_API(float, sheen_tint)
 +  NODE_PUBLIC_API(float, clearcoat)
 +  NODE_PUBLIC_API(float, clearcoat_roughness)
 +  NODE_PUBLIC_API(float, ior)
 +  NODE_PUBLIC_API(float, transmission)
 +  NODE_PUBLIC_API(float, anisotropic_rotation)
 +  NODE_PUBLIC_API(float, transmission_roughness)
 +  NODE_PUBLIC_API(float3, normal)
 +  NODE_PUBLIC_API(float3, clearcoat_normal)
 +  NODE_PUBLIC_API(float3, tangent)
 +  NODE_PUBLIC_API(float, surface_mix_weight)
 +  NODE_PUBLIC_API(ClosureType, distribution)
 +  NODE_PUBLIC_API(ClosureType, subsurface_method)
 +  NODE_PUBLIC_API(float3, emission)
++  NODE_PUBLIC_API(float, emission_strength)
 +  NODE_PUBLIC_API(float, alpha)
 +
 + private:
 +  ClosureType distribution_orig;
  
 + public:
    bool has_integrator_dependency();
    void attributes(Shader *shader, AttributeRequestSet *attributes);
    bool has_attribute_dependency()