diff options
| author | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
|---|---|---|
| committer | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
| commit | e734491048ef2436af41e272b8900f20785ecbe6 (patch) | |
| tree | 8cee3fc068c782c0ba8cb9a581e768968c565569 /intern/cycles/kernel/closure/bsdf_toon.h | |
| parent | f21cd0881948f6eaf16af0b354cd904df7407bda (diff) | |
| parent | 204b01a254ac2445fea217e5211b2ed6aef631ca (diff) | |
Merge branch 'master' into soc-2021-knife-toolssoc-2021-knife-tools
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_toon.h')
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf_toon.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_toon.h b/intern/cycles/kernel/closure/bsdf_toon.h index cc5de21ed0e..acdafe0f735 100644 --- a/intern/cycles/kernel/closure/bsdf_toon.h +++ b/intern/cycles/kernel/closure/bsdf_toon.h @@ -30,8 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __BSDF_TOON_H__ -#define __BSDF_TOON_H__ +#pragma once CCL_NAMESPACE_BEGIN @@ -55,15 +54,6 @@ ccl_device int bsdf_diffuse_toon_setup(ToonBsdf *bsdf) return SD_BSDF | SD_BSDF_HAS_EVAL; } -ccl_device bool bsdf_toon_merge(const ShaderClosure *a, const ShaderClosure *b) -{ - const ToonBsdf *bsdf_a = (const ToonBsdf *)a; - const ToonBsdf *bsdf_b = (const ToonBsdf *)b; - - return (isequal_float3(bsdf_a->N, bsdf_b->N)) && (bsdf_a->size == bsdf_b->size) && - (bsdf_a->smooth == bsdf_b->smooth); -} - ccl_device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float angle) { float is; @@ -248,5 +238,3 @@ ccl_device int bsdf_glossy_toon_sample(const ShaderClosure *sc, } CCL_NAMESPACE_END - -#endif /* __BSDF_TOON_H__ */ |