Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/osl/bsdf_phong_ramp.cpp')
-rw-r--r--intern/cycles/kernel/osl/bsdf_phong_ramp.cpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index ef656ee7d5f..c5851747b54 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -45,12 +45,11 @@ using namespace OSL;
class PhongRampClosure : public CBSDFClosure {
public:
- PhongRampClosure() : CBSDFClosure(LABEL_GLOSSY) {}
Color3 colors[8];
float3 fcolors[8];
- size_t memsize() const { return sizeof(*this); }
- const char *name() const { return "phong_ramp"; }
+ PhongRampClosure() : CBSDFClosure(LABEL_GLOSSY)
+ {}
void setup()
{
@@ -61,21 +60,11 @@ public:
fcolors[i] = TO_FLOAT3(colors[i]);
}
- bool mergeable(const ClosurePrimitive *other) const
- {
- return false;
- }
-
void blur(float roughness)
{
bsdf_phong_ramp_blur(&sc, roughness);
}
- void print_on(std::ostream &out) const
- {
- out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " << sc.N[2] << "))";
- }
-
float3 eval_reflect(const float3 &omega_out, const float3 &omega_in, float& pdf) const
{
return bsdf_phong_ramp_eval_reflect(&sc, fcolors, omega_out, omega_in, &pdf);
@@ -109,7 +98,7 @@ ClosureParam *closure_bsdf_phong_ramp_params()
return params;
}
-CLOSURE_PREPARE(closure_bsdf_phong_ramp_prepare, PhongRampClosure)
+CCLOSURE_PREPARE(closure_bsdf_phong_ramp_prepare, PhongRampClosure)
CCL_NAMESPACE_END