diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/nodes/intern/node_util.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/nodes/intern/node_util.h')
-rw-r--r-- | source/blender/nodes/intern/node_util.h | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h index 00b2063804b..ec5cd074922 100644 --- a/source/blender/nodes/intern/node_util.h +++ b/source/blender/nodes/intern/node_util.h @@ -21,7 +21,6 @@ * \ingroup nodes */ - #ifndef __NODE_UTIL_H__ #define __NODE_UTIL_H__ @@ -44,12 +43,12 @@ struct bNodeTree; /* data for initializing node execution */ typedef struct bNodeExecContext { - struct bNodeInstanceHash *previews; + struct bNodeInstanceHash *previews; } bNodeExecContext; typedef struct bNodeExecData { - void *data; /* custom data storage */ - struct bNodePreview *preview; /* optional preview image */ + void *data; /* custom data storage */ + struct bNodePreview *preview; /* optional preview image */ } bNodeExecData; /**** Storage Data ****/ @@ -57,9 +56,15 @@ typedef struct bNodeExecData { extern void node_free_curves(struct bNode *node); extern void node_free_standard_storage(struct bNode *node); -extern void node_copy_curves(struct bNodeTree *dest_ntree, struct bNode *dest_node, struct bNode *src_node); -extern void node_copy_standard_storage(struct bNodeTree *dest_ntree, struct bNode *dest_node, struct bNode *src_node); -extern void *node_initexec_curves(struct bNodeExecContext *context, struct bNode *node, bNodeInstanceKey key); +extern void node_copy_curves(struct bNodeTree *dest_ntree, + struct bNode *dest_node, + struct bNode *src_node); +extern void node_copy_standard_storage(struct bNodeTree *dest_ntree, + struct bNode *dest_node, + struct bNode *src_node); +extern void *node_initexec_curves(struct bNodeExecContext *context, + struct bNode *node, + bNodeInstanceKey key); /**** Labels ****/ @@ -69,16 +74,30 @@ void node_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, i void node_vect_math_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen); void node_filter_label(struct bNodeTree *ntree, struct bNode *node, char *label, int maxlen); - /*** Link Handling */ void node_insert_link_default(struct bNodeTree *ntree, struct bNode *node, struct bNodeLink *link); void node_update_internal_links_default(struct bNodeTree *ntree, struct bNode *node); float node_socket_get_float(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock); -void node_socket_set_float(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock, float value); -void node_socket_get_color(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock, float *value); -void node_socket_set_color(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock, const float *value); -void node_socket_get_vector(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock, float *value); -void node_socket_set_vector(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock, const float *value); +void node_socket_set_float(struct bNodeTree *ntree, + struct bNode *node, + struct bNodeSocket *sock, + float value); +void node_socket_get_color(struct bNodeTree *ntree, + struct bNode *node, + struct bNodeSocket *sock, + float *value); +void node_socket_set_color(struct bNodeTree *ntree, + struct bNode *node, + struct bNodeSocket *sock, + const float *value); +void node_socket_get_vector(struct bNodeTree *ntree, + struct bNode *node, + struct bNodeSocket *sock, + float *value); +void node_socket_set_vector(struct bNodeTree *ntree, + struct bNode *node, + struct bNodeSocket *sock, + const float *value); #endif |