diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-15 01:54:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-15 01:54:12 +0300 |
| commit | 680994643cf76f3b0643d0fc4d8a32094431c026 (patch) | |
| tree | 10bb79fc094af92c65637d64dd4d73348081702c /intern/cycles/render/nodes.h | |
| parent | 92a6b0ad6fbaef51f27105623f9be1b68103bd5d (diff) | |
| parent | 83a4e1aaf9d1aa5e4747213dee5485945cecb05d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/nodes.h')
| -rw-r--r-- | intern/cycles/render/nodes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 860d50242e9..fd043ce5161 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -189,7 +189,9 @@ public: virtual int get_group() { return NODE_GROUP_LEVEL_2; } NodeVoronoiColoring coloring; - float scale; + NodeVoronoiDistanceMetric metric; + NodeVoronoiFeature feature; + float scale, exponent; float3 vector; }; |