diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
commit | ef22d2e8adb9965cd3cb91e733d4b9754cf6024f (patch) | |
tree | 1d95a52cd619be4b9974c6aa2f197373a1831912 /source/blender/nodes/texture | |
parent | 2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8 (diff) | |
parent | d02335a1950c81fffea815f31e47bca92ab7d33c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/texture')
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_math.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c index 19bc16fb82d..d8dc2a62625 100644 --- a/source/blender/nodes/texture/nodes/node_texture_math.c +++ b/source/blender/nodes/texture/nodes/node_texture_math.c @@ -189,6 +189,12 @@ static void valuefn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor break; } + case NODE_MATH_ATAN2: + { + *out = atan2(in0, in1); + break; + } + default: { BLI_assert(0); |