Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-13 12:22:21 +02:00
parent 399cbd3b6b 30bffb5a3a
commit c7c7bfae75
12 changed files with 222 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/nodes.cpp
View File

@@ -5068,6 +5068,10 @@ NODE_DEFINE(MathNode)
type_enum.insert("modulo", NODE_MATH_MODULO);
type_enum.insert("absolute", NODE_MATH_ABSOLUTE);
type_enum.insert("arctan2", NODE_MATH_ARCTAN2);
type_enum.insert("floor", NODE_MATH_FLOOR);
type_enum.insert("ceil", NODE_MATH_CEIL);
type_enum.insert("fract", NODE_MATH_FRACT);
type_enum.insert("sqrt", NODE_MATH_SQRT);
SOCKET_ENUM(type, "Type", type_enum, NODE_MATH_ADD);
SOCKET_BOOLEAN(use_clamp, "Use Clamp", false);