blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: Remove includes in node_util.h header 

This ends up including the removed headers in many unnecessary places.
Also, remove unnecessary extern from function definitions.
This commit is contained in:
Hans Goudey 2021-12-12 22:53:03 -06:00
parent f5679838bc
commit d9d4b9899e
3 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_node/drawnode.cc
View File

@ -2454,7 +2454,6 @@ static void node_composit_buts_planetrackdeform(uiLayout *layout, bContext *C, P
}
}
static void node_composit_buts_sunbeams(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
uiItemR(layout, ptr, "source", DEFAULT_FLAGS | UI_ITEM_R_EXPAND, "", ICON_NONE);

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

@ -42,8 +42,8 @@
#include "RE_pipeline.h"
/* only for forward declarations */
#include "NOD_composite.h"
#include "NOD_socket.h"
#include "NOD_socket_declarations.hh"
#define CMP_SCALE_MAX 12000

36
source/blender/nodes/intern/node_util.h
View File

@ -23,20 +23,6 @@
#pragma once
#include "DNA_listBase.h"
#include "BLI_utildefines.h"
#include "BKE_node.h"
#include "MEM_guardedalloc.h"
#include "NOD_socket.h"
#include "GPU_material.h" /* For Shader muting GPU code... */
#include "RNA_access.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -56,18 +42,18 @@ typedef struct bNodeExecData {
/**** Storage Data ****/
extern void node_free_curves(struct bNode *node);
extern void node_free_standard_storage(struct bNode *node);
void node_free_curves(struct bNode *node);
void node_free_standard_storage(struct bNode *node);
extern void node_copy_curves(struct bNodeTree *dest_ntree,
struct bNode *dest_node,
const struct bNode *src_node);
extern void node_copy_standard_storage(struct bNodeTree *dest_ntree,
struct bNode *dest_node,
const struct bNode *src_node);
extern void *node_initexec_curves(struct bNodeExecContext *context,
struct bNode *node,
bNodeInstanceKey key);
void node_copy_curves(struct bNodeTree *dest_ntree,
struct bNode *dest_node,
const struct bNode *src_node);
void node_copy_standard_storage(struct bNodeTree *dest_ntree,
struct bNode *dest_node,
const struct bNode *src_node);
void *node_initexec_curves(struct bNodeExecContext *context,
struct bNode *node,
bNodeInstanceKey key);
/**** Updates ****/
void node_sock_label(struct bNodeSocket *sock, const char *name);