diff options
author | Hans Goudey <h.goudey@me.com> | 2022-01-20 19:36:56 +0300 |
---|---|---|
committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-11 01:28:36 +0300 |
commit | 3bd815e35599c5cc03318bfc41895fb542ec93b1 (patch) | |
tree | a64b0da29f495f61b57aed6c1a8af923c8d6f183 /source/blender/editors/space_node/node_ops.cc | |
parent | c9d0c7508e2c5be34e5f00693b3aabcd037af96a (diff) |
Cleanup: Move node editor files to proper namespace
This commit moves code in all node editor files to the
`blender::ed::space_node` namespace, except for C API
functions defined in `ED_node.h`, which can only be moved
once all areas calling them are moved to C++.
The change is fairly straightforward, I just moved a couple
of "ED_" code blocks around to make the namespace more
contiguous, and there's the method for adding a pointer to
a struct in a C++ namespace in DNA.
Differential Revision: https://developer.blender.org/D13871
Diffstat (limited to 'source/blender/editors/space_node/node_ops.cc')
-rw-r--r-- | source/blender/editors/space_node/node_ops.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/editors/space_node/node_ops.cc b/source/blender/editors/space_node/node_ops.cc index a6264f151e4..2ca475f6948 100644 --- a/source/blender/editors/space_node/node_ops.cc +++ b/source/blender/editors/space_node/node_ops.cc @@ -35,6 +35,8 @@ #include "node_intern.hh" /* own include */ +namespace blender::ed::space_node { + void node_operatortypes() { WM_operatortype_append(NODE_OT_select); @@ -127,6 +129,17 @@ void node_operatortypes() WM_operatortype_append(NODE_OT_cryptomatte_layer_remove); } +void node_keymap(struct wmKeyConfig *keyconf) +{ + /* Entire Editor only ----------------- */ + WM_keymap_ensure(keyconf, "Node Generic", SPACE_NODE, 0); + + /* Main Region only ----------------- */ + WM_keymap_ensure(keyconf, "Node Editor", SPACE_NODE, 0); +} + +} // namespace blender::ed::space_node + void ED_operatormacros_node() { wmOperatorType *ot; @@ -203,12 +216,3 @@ void ED_operatormacros_node() WM_operatortype_macro_define(ot, "NODE_OT_links_detach"); WM_operatortype_macro_define(ot, "NODE_OT_translate_attach"); } - -void node_keymap(struct wmKeyConfig *keyconf) -{ - /* Entire Editor only ----------------- */ - WM_keymap_ensure(keyconf, "Node Generic", SPACE_NODE, 0); - - /* Main Region only ----------------- */ - WM_keymap_ensure(keyconf, "Node Editor", SPACE_NODE, 0); -} |