blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Cleanup: Move NOD_socket.h to C++ #109623

Merged
Hans Goudey merged 1 commits from HooglyBoogly/blender:cleanup-nod-socket-cpp into main 2023-07-02 21:02:03 +02:00
Conversation 1 Commits 1 Files Changed 20 +50 -70
20 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/node.cc
View File

@ -83,7 +83,7 @@
#include "NOD_node_declaration.hh"
#include "NOD_register.hh"
#include "NOD_shader.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_texture.h"
#include "DEG_depsgraph.h"

2
source/blender/blenkernel/intern/node_tree_update.cc
View File

@ -28,7 +28,7 @@
#include "MOD_nodes.h"
#include "NOD_node_declaration.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_texture.h"
#include "DEG_depsgraph_query.h"

3
source/blender/blenloader/intern/versioning_250.c
View File

@ -59,6 +59,7 @@
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_multires.h"
#include "BKE_node.h"
#include "BKE_node_tree_update.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
@ -68,8 +69,6 @@
#include "SEQ_iterator.h"
#include "NOD_socket.h"
#include "BLO_readfile.h"
#include "readfile.h"

2
source/blender/blenloader/intern/versioning_270.cc
View File

@ -68,7 +68,7 @@
#include "NOD_common.h"
#include "NOD_composite.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "readfile.h"

3
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -61,6 +61,7 @@
#include "BKE_mesh.h" /* for ME_ defines (patching) */
#include "BKE_mesh_legacy_convert.h"
#include "BKE_modifier.h"
#include "BKE_node.h"
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
@ -68,8 +69,6 @@
#include "SEQ_iterator.h"
#include "SEQ_sequencer.h"
#include "NOD_socket.h"
#include "BLO_readfile.h"
#include "readfile.h"

2
source/blender/editors/space_node/clipboard.cc
View File

@ -18,7 +18,7 @@
#include "ED_render.h"
#include "ED_screen.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "RNA_access.h"
#include "RNA_define.h"

2
source/blender/editors/space_node/link_drag_search.cc
View File

@ -17,7 +17,7 @@
#include "BKE_node_tree_update.h"
#include "BKE_screen.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_socket_search_link.hh"
#include "BLT_translation.h"

2
source/blender/editors/space_node/node_edit.cc
View File

@ -68,7 +68,7 @@
#include "NOD_composite.h"
#include "NOD_geometry.hh"
#include "NOD_shader.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_texture.h"
#include "node_intern.hh" /* own include */

2
source/blender/editors/space_node/node_group.cc
View File

@ -56,7 +56,7 @@
#include "NOD_composite.h"
#include "NOD_geometry.hh"
#include "NOD_shader.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_texture.h"
#include "node_intern.hh" /* own include */

2
source/blender/editors/space_node/node_templates.cc
View File

@ -32,7 +32,7 @@
#include "RNA_prototypes.h"
#include "NOD_node_declaration.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_socket_declarations.hh"
#include "../interface/interface_intern.hh" /* XXX bad level */

4
source/blender/makesrna/intern/rna_nodetree.cc
View File

@ -57,7 +57,7 @@
#include "NOD_composite.h"
#include "NOD_geometry.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
@ -610,7 +610,7 @@ static EnumPropertyItem rna_node_geometry_mesh_circle_fill_type_items[] = {
# include "NOD_composite.h"
# include "NOD_geometry.hh"
# include "NOD_shader.h"
# include "NOD_socket.h"
# include "NOD_socket.hh"
# include "NOD_texture.h"
# include "RE_engine.h"

2
source/blender/nodes/CMakeLists.txt
View File

@ -72,7 +72,7 @@ set(SRC
NOD_node_declaration.hh
NOD_register.hh
NOD_shader.h
NOD_socket.h
NOD_socket.hh
NOD_socket_declarations.hh
NOD_socket_declarations_geometry.hh
NOD_socket_search_link.hh

49
source/blender/nodes/NOD_socket.h
View File

@ -1,49 +0,0 @@
/* SPDX-FileCopyrightText: 2007 Blender Foundation
*
* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup nodes
*/
#pragma once
#include "DNA_listBase.h"
#include "BLI_utildefines.h"
#include "BKE_node.h"
#include "RNA_types.h"
struct bNode;
struct bNodeTree;
#ifdef __cplusplus
extern "C" {
#endif
struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree,
struct bNode *node,
struct bNodeSocketTemplate *stemp,
eNodeSocketInOut in_out);
void node_verify_sockets(struct bNodeTree *ntree, struct bNode *node, bool do_id_user);
void node_socket_init_default_value(struct bNodeSocket *sock);
void node_socket_copy_default_value(struct bNodeSocket *to, const struct bNodeSocket *from);
void register_standard_node_socket_types(void);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
namespace blender::nodes {
void update_node_declaration_and_sockets(bNodeTree &ntree, bNode &node);
} // namespace blender::nodes
#endif

31
source/blender/nodes/NOD_socket.hh Normal file
View File

@ -0,0 +1,31 @@
/* SPDX-FileCopyrightText: 2007 Blender Foundation
*
* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup nodes
*/
#pragma once
#include "BKE_node.h"
struct bNode;
struct bNodeTree;
bNodeSocket *node_add_socket_from_template(bNodeTree *ntree,
bNode *node,
bNodeSocketTemplate *stemp,
eNodeSocketInOut in_out);
void node_verify_sockets(bNodeTree *ntree, bNode *node, bool do_id_user);
void node_socket_init_default_value(bNodeSocket *sock);
void node_socket_copy_default_value(bNodeSocket *to, const bNodeSocket *from);
void register_standard_node_socket_types();
namespace blender::nodes {
void update_node_declaration_and_sockets(bNodeTree &ntree, bNode &node);
} // namespace blender::nodes

2
source/blender/nodes/composite/node_composite_util.hh
View File

@ -15,7 +15,7 @@
#include "node_util.hh"
#include "NOD_composite.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_socket_declarations.hh"
#define CMP_SCALE_MAX 12000

2
source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc
View File

@ -11,7 +11,7 @@
#include "UI_resources.h"
#include "NOD_geometry.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "node_geometry_util.hh"

2
source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc
View File

@ -17,7 +17,7 @@
#include "UI_interface.h"
#include "NOD_common.h"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "FN_field_cpp_type.hh"

2
source/blender/nodes/intern/node_common.cc
View File

@ -35,7 +35,7 @@
#include "NOD_common.h"
#include "NOD_node_declaration.hh"
#include "NOD_register.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "NOD_socket_declarations.hh"
#include "NOD_socket_declarations_geometry.hh"
#include "node_common.h"

2
source/blender/nodes/intern/node_register.cc
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "NOD_register.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "BKE_node.hh"

2
source/blender/nodes/intern/node_socket.cc
View File

@ -34,7 +34,7 @@
#include "MEM_guardedalloc.h"
#include "NOD_node_declaration.hh"
#include "NOD_socket.h"
#include "NOD_socket.hh"
#include "FN_field.hh"