[Bf-blender-cvs] [6a489ee4f8a] principled-v2: Cleanup: Remove unused clearcoat parameter
Lukas Stockner
noreply at git.blender.org
Mon Jul 4 23:56:14 CEST 2022
Commit: 6a489ee4f8a628c8561d6d8964aa9958940538fa
Author: Lukas Stockner
Date: Mon Jul 4 23:31:48 2022 +0200
Branches: principled-v2
https://developer.blender.org/rB6a489ee4f8a628c8561d6d8964aa9958940538fa
Cleanup: Remove unused clearcoat parameter
===================================================================
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/osl/closures.cpp
M intern/cycles/kernel/svm/closure_principled.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index f656e4c2dcf..904640356ef 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -16,7 +16,6 @@ CCL_NAMESPACE_BEGIN
typedef struct MicrofacetExtra {
float3 color, cspec0;
float3 fresnel_color;
- float clearcoat;
} MicrofacetExtra;
typedef struct MicrofacetBsdf {
diff --git a/intern/cycles/kernel/osl/closures.cpp b/intern/cycles/kernel/osl/closures.cpp
index 80e0ac37c0f..39157f0b796 100644
--- a/intern/cycles/kernel/osl/closures.cpp
+++ b/intern/cycles/kernel/osl/closures.cpp
@@ -592,7 +592,6 @@ class MicrofacetFresnelClosure : public CBSDFClosure {
bsdf->extra = extra;
bsdf->extra->color = color;
bsdf->extra->cspec0 = cspec0;
- bsdf->extra->clearcoat = 0.0f;
return bsdf;
}
};
@@ -690,7 +689,6 @@ class MicrofacetMultiClosure : public CBSDFClosure {
bsdf->extra = extra;
bsdf->extra->color = color;
bsdf->extra->cspec0 = make_float3(0.0f, 0.0f, 0.0f);
- bsdf->extra->clearcoat = 0.0f;
return bsdf;
}
};
@@ -820,7 +818,6 @@ class MicrofacetMultiFresnelClosure : public CBSDFClosure {
bsdf->extra = extra;
bsdf->extra->color = color;
bsdf->extra->cspec0 = cspec0;
- bsdf->extra->clearcoat = 0.0f;
return bsdf;
}
};
diff --git a/intern/cycles/kernel/svm/closure_principled.h b/intern/cycles/kernel/svm/closure_principled.h
index 9c9e9ebc709..9970cb2d9e6 100644
--- a/intern/cycles/kernel/svm/closure_principled.h
+++ b/intern/cycles/kernel/svm/closure_principled.h
@@ -161,7 +161,6 @@ ccl_device_inline void principled_v1_specular(KernelGlobals kg,
bsdf->extra->cspec0 = lerp(specular * 0.08f * specular_color, base_color, metallic);
bsdf->extra->color = base_color;
- bsdf->extra->clearcoat = 0.0f;
/* setup bsdf */
if (distribution == CLOSURE_BSDF_MICROFACET_GGX_GLASS_ID ||
@@ -205,7 +204,6 @@ ccl_device_inline void principled_v1_glass_refl(ccl_private ShaderData *sd,
bsdf->extra->color = base_color;
bsdf->extra->cspec0 = lerp(one_float3(), base_color, specular_tint);
- bsdf->extra->clearcoat = 0.0f;
/* setup bsdf */
sd->flag |= bsdf_microfacet_ggx_fresnel_setup(bsdf, sd);
@@ -341,7 +339,6 @@ ccl_device_inline void principled_v1_glass_multi(KernelGlobals kg,
bsdf->extra->color = base_color;
bsdf->extra->cspec0 = lerp(one_float3(), base_color, specular_tint);
- bsdf->extra->clearcoat = 0.0f;
/* setup bsdf */
sd->flag |= bsdf_microfacet_multi_ggx_glass_fresnel_setup(bsdf, sd);
More information about the Bf-blender-cvs
mailing list