diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-27 18:21:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-07-27 18:21:43 +0300 |
| commit | 31657fef40d1a99e96b4a318a6ca6b4b5b68539d (patch) | |
| tree | 0c27962cb3f4fdb286252721f3aeb89c379c22f2 /intern/cycles/graph/node_type.h | |
| parent | af2a801731441d132b81bd109c999bde3db58a88 (diff) | |
| parent | 84d47e3685c7ccfeaf2dd41ab64d1b642f157add (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/graph/node_type.h')
| -rw-r--r-- | intern/cycles/graph/node_type.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h index d4e2dbceff6..1d565794b27 100644 --- a/intern/cycles/graph/node_type.h +++ b/intern/cycles/graph/node_type.h @@ -114,9 +114,9 @@ struct NodeType void register_input(ustring name, ustring ui_name, SocketType::Type type, int struct_offset, const void *default_value, - const NodeEnum *enum_values = NULL, - const NodeType **node_type = NULL, - int flags = 0, int extra_flags = 0); + const NodeEnum *enum_values = NULL, + const NodeType **node_type = NULL, + int flags = 0, int extra_flags = 0); void register_output(ustring name, ustring ui_name, SocketType::Type type); const SocketType *find_input(ustring name) const; |