diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:04:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-16 00:16:49 +0300 |
| commit | 01f576e87b54159bb360cf1ed85518bb75231107 (patch) | |
| tree | 0ac38f90154f8ee08a35fb88c5cf742403bbcb3c /intern/cycles/render/nodes.h | |
| parent | 469408de725353b461d073097d88b6b810c16c38 (diff) | |
| parent | 799779d432309e518922d23e3a1d1b5baaece71d (diff) | |
Merge branch 'master' into blender2.8
The Eevee AO node supports the new Normal socket, but ignores Distance,
Samples, Inside and Only Local settings.
Diffstat (limited to 'intern/cycles/render/nodes.h')
| -rw-r--r-- | intern/cycles/render/nodes.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index d1c7c9176e1..996c582d206 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -540,12 +540,16 @@ public: SHADER_NODE_CLASS(AmbientOcclusionNode) bool has_spatial_varying() { return true; } - virtual int get_group() { return NODE_GROUP_LEVEL_1; } - virtual ClosureType get_closure_type() { return CLOSURE_AMBIENT_OCCLUSION_ID; } + virtual int get_group() { return NODE_GROUP_LEVEL_3; } + virtual bool has_raytrace() { return true; } - float3 normal_osl; float3 color; - float surface_mix_weight; + float distance; + float3 normal; + int samples; + + bool only_local; + bool inside; }; class VolumeNode : public ShaderNode { |