diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-25 01:57:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-25 01:57:13 +0400 |
commit | c411cde415ee7dc8a208e932d5ba1a240c4e669e (patch) | |
tree | 73cd438267668b806d88f152cee8506833b4ae85 /source/blender/nodes | |
parent | 7539009d5b3ee1b2ddb76400917a9876a3cfe184 (diff) |
header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_common.c | 4 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_exec.c | 6 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_exec.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/shader/node_shader_util.h | 12 | ||||
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_common.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/texture/node_texture_util.h | 13 | ||||
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_common.c | 2 |
8 files changed, 23 insertions, 20 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c index 835c2b75aa4..7198798a152 100644 --- a/source/blender/nodes/composite/nodes/node_composite_common.c +++ b/source/blender/nodes/composite/nodes/node_composite_common.c @@ -32,12 +32,12 @@ #include "DNA_node_types.h" -#include "BKE_node.h" - #include "node_composite_util.h" #include "node_common.h" #include "node_exec.h" +#include "BKE_node.h" + void register_node_type_cmp_group(bNodeTreeType *ttype) { static bNodeType ntype; diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c index 579d46f45eb..7a8b8c940c9 100644 --- a/source/blender/nodes/intern/node_exec.c +++ b/source/blender/nodes/intern/node_exec.c @@ -287,7 +287,7 @@ void ntreeReleaseThreadStack(bNodeThreadStack *nts) nts->used = 0; } -int ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *callerdata, int thread) +bool ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *callerdata, int thread) { bNodeStack *nsin[MAX_SOCKET]; /* arbitrary... watch this */ bNodeStack *nsout[MAX_SOCKET]; /* arbitrary... watch this */ @@ -306,7 +306,7 @@ int ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *calle * and hence execute it! */ // if (node->typeinfo->compatibility == NODE_NEW_SHADING) -// return 0; +// return false; if (node->typeinfo->execfunc) node->typeinfo->execfunc(callerdata, node, nsin, nsout); else if (node->typeinfo->newexecfunc) @@ -315,5 +315,5 @@ int ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *calle } /* signal to that all went OK, for render */ - return 1; + return true; } diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h index 679439ef12e..5febda036e0 100644 --- a/source/blender/nodes/intern/node_exec.h +++ b/source/blender/nodes/intern/node_exec.h @@ -79,6 +79,6 @@ void ntree_exec_end(struct bNodeTreeExec *exec); struct bNodeThreadStack *ntreeGetThreadStack(struct bNodeTreeExec *exec, int thread); void ntreeReleaseThreadStack(struct bNodeThreadStack *nts); -int ntreeExecThreadNodes(struct bNodeTreeExec *exec, struct bNodeThreadStack *nts, void *callerdata, int thread); +bool ntreeExecThreadNodes(struct bNodeTreeExec *exec, struct bNodeThreadStack *nts, void *callerdata, int thread); #endif diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 74a64f186cb..8fde0b9c342 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -249,7 +249,7 @@ void ntreeShaderEndExecTree(bNodeTreeExec *exec, int use_tree_data) } /* only for Blender internal */ -int ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr) +bool ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr) { ShaderCallData scd; /** diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index e4dc74e8d40..9c911501435 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -49,6 +49,12 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" +#include "BLI_math.h" +#include "BLI_blenlib.h" +#include "BLI_rand.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" + #include "BKE_blender.h" #include "BKE_colortools.h" #include "BKE_global.h" @@ -63,12 +69,6 @@ #include "NOD_shader.h" #include "node_util.h" -#include "BLI_math.h" -#include "BLI_blenlib.h" -#include "BLI_rand.h" -#include "BLI_threads.h" -#include "BLI_utildefines.h" - #include "BLF_translation.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c index cf6f778bbf5..9c784709de3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_common.c +++ b/source/blender/nodes/shader/nodes/node_shader_common.c @@ -33,6 +33,8 @@ #include "DNA_node_types.h" +#include "BLI_utildefines.h" + #include "BKE_node.h" #include "node_shader_util.h" diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h index 16dbc2f7bfb..3b2a7e14f69 100644 --- a/source/blender/nodes/texture/node_texture_util.h +++ b/source/blender/nodes/texture/node_texture_util.h @@ -48,6 +48,12 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" +#include "BLI_math.h" +#include "BLI_blenlib.h" +#include "BLI_rand.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" + #include "BKE_blender.h" #include "BKE_colortools.h" #include "BKE_global.h" @@ -56,19 +62,12 @@ #include "BKE_material.h" #include "BKE_node.h" #include "BKE_texture.h" - #include "BKE_library.h" #include "node_util.h" #include "NOD_texture.h" -#include "BLI_math.h" -#include "BLI_blenlib.h" -#include "BLI_rand.h" -#include "BLI_threads.h" -#include "BLI_utildefines.h" - #include "BLF_translation.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c index 41bfd0ae00a..aa427ff3587 100644 --- a/source/blender/nodes/texture/nodes/node_texture_common.c +++ b/source/blender/nodes/texture/nodes/node_texture_common.c @@ -33,6 +33,8 @@ #include "DNA_node_types.h" +#include "BLI_utildefines.h" + #include "BKE_node.h" #include "node_texture_util.h" |