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 | |
parent | 7539009d5b3ee1b2ddb76400917a9876a3cfe184 (diff) |
header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree
Diffstat (limited to 'source/blender')
27 files changed, 78 insertions, 85 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 64fb49c4d66..5f504df5628 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -731,4 +731,4 @@ BLI_INLINE int DM_origindex_mface_mpoly(const int *index_mf_to_mpoly, const int return (j != ORIGINDEX_NONE) ? (index_mp_to_orig ? index_mp_to_orig[j] : j) : ORIGINDEX_NONE; } -#endif +#endif /* __BKE_DERIVEDMESH_H__ */ diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 1b7b29432e2..8e4d370e8a0 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -99,5 +99,4 @@ typedef struct Main { } #endif -#endif - +#endif /* __BKE_MAIN_H__ */ diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index d3fb7eeffc1..718fa2f9ecd 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -577,7 +577,7 @@ struct ShadeResult; struct bNodeTreeExec *ntreeShaderBeginExecTree(struct bNodeTree *ntree, int use_tree_data); void ntreeShaderEndExecTree(struct bNodeTreeExec *exec, int use_tree_data); -int ntreeShaderExecTree(struct bNodeTree *ntree, struct ShadeInput *shi, struct ShadeResult *shr); +bool ntreeShaderExecTree(struct bNodeTree *ntree, struct ShadeInput *shi, struct ShadeResult *shr); void ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int osa, short *texco, int *mode); void nodeShaderSynchronizeID(struct bNode *node, int copyto); diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index ad828a70dd8..5028d978351 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -38,11 +38,11 @@ #include "BLI_utildefines.h" #include "BLI_linklist.h" +#include "BLI_math.h" #include "BKE_DerivedMesh.h" #include "BKE_tessmesh.h" -#include "BLI_math.h" #include "MEM_guardedalloc.h" /* Math stuff for ray casting on mesh faces and for nearest surface */ diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index c4274aa1f93..695ac7da792 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -35,10 +35,6 @@ #include "DNA_scene_types.h" -#include "BKE_global.h" /* XXX TESTING */ -#include "BKE_image.h" -#include "BKE_ocean.h" - #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_rand.h" @@ -46,6 +42,9 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BKE_image.h" +#include "BKE_ocean.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -1425,4 +1424,4 @@ void BKE_bake_ocean(struct Ocean *UNUSED(o), struct OceanCache *UNUSED(och), /* unused */ (void)update_cb; } -#endif /* WITH_OCEANSIM */
\ No newline at end of file +#endif /* WITH_OCEANSIM */ diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 15b8eb184d0..56c8ffb6931 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -132,7 +132,7 @@ #define hypotf(a, b) ((float)hypot(a, b)) #endif -#endif +#endif /* C99 or POSIX.1-2001 */ #ifdef WIN32 # ifndef FREE_WINDOWS diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index fa8beb3716c..0976c4cdfbb 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -36,6 +36,9 @@ #include "DNA_key_types.h" #include "DNA_modifier_types.h" +#include "BLI_math.h" +#include "BLI_array.h" + #include "BKE_mesh.h" #include "BLI_listbase.h" #include "BKE_global.h" @@ -43,9 +46,6 @@ #include "BKE_main.h" #include "BKE_customdata.h" -#include "BLI_math.h" -#include "BLI_array.h" - #include "bmesh.h" #include "intern/bmesh_private.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index bdff02c1551..3385d334b71 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -34,11 +34,14 @@ #include "DNA_dynamicpaint_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_object_force.h" #include "BLI_utildefines.h" #include "BLI_string.h" #include "BLI_ghash.h" #include "BLI_rect.h" +#include "BLI_math.h" +#include "BLI_listbase.h" #include "BLF_api.h" #include "BLF_translation.h" @@ -46,22 +49,26 @@ #include "BKE_animsys.h" #include "BKE_colortools.h" #include "BKE_context.h" +#include "BKE_depsgraph.h" +#include "BKE_displist.h" #include "BKE_dynamicpaint.h" #include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_object.h" #include "BKE_material.h" -#include "BKE_texture.h" +#include "BKE_modifier.h" +#include "BKE_object.h" +#include "BKE_particle.h" #include "BKE_report.h" -#include "BKE_displist.h" #include "BKE_sca.h" #include "BKE_scene.h" #include "BKE_screen.h" +#include "BKE_texture.h" #include "ED_screen.h" #include "ED_object.h" #include "ED_render.h" +#include "ED_util.h" #include "RNA_access.h" #include "RNA_enum_types.h" @@ -716,21 +723,6 @@ void uiTemplatePathBuilder(uiLayout *layout, PointerRNA *ptr, const char *propna #define ERROR_LIBDATA_MESSAGE "Can't edit external libdata" -#include <string.h> - -#include "DNA_object_force.h" - -#include "BKE_depsgraph.h" -#include "BKE_modifier.h" -#include "BKE_particle.h" - -#include "ED_util.h" - -#include "BLI_math.h" -#include "BLI_listbase.h" - -#include "ED_object.h" - static void modifiers_setOnCage(bContext *C, void *ob_v, void *md_v) { Scene *scene = CTX_data_scene(C); diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index f073fdd5125..105c2dc88d1 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -38,13 +38,12 @@ #include "BLI_rect.h" #include "BLI_utildefines.h" +#include "BLI_math.h" +#include "BLI_threads.h" #include "BKE_blender.h" #include "BKE_colortools.h" -#include "BLI_math.h" -#include "BLI_threads.h" - #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 04154a27b74..927834a8924 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -33,13 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_main.h" -#include "BKE_mask.h" -#include "BKE_movieclip.h" -#include "BKE_context.h" -#include "BKE_tracking.h" -#include "BKE_library.h" - #include "DNA_mask_types.h" #include "DNA_object_types.h" /* SELECT */ @@ -48,6 +41,13 @@ #include "BLI_string.h" #include "BLI_rect.h" +#include "BKE_main.h" +#include "BKE_mask.h" +#include "BKE_movieclip.h" +#include "BKE_context.h" +#include "BKE_tracking.h" +#include "BKE_library.h" + #include "GPU_extensions.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index a3efa15c54a..7d2b80d50ba 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -30,14 +30,14 @@ #include "DNA_node_types.h" -#include "BKE_context.h" -#include "BKE_main.h" -#include "BKE_node.h" - #include "BLI_rect.h" #include "BLI_lasso.h" #include "BLI_utildefines.h" +#include "BKE_context.h" +#include "BKE_main.h" +#include "BKE_node.h" + #include "ED_node.h" /* own include */ #include "ED_screen.h" #include "ED_types.h" diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 615ae71cf9b..bf1c5404c0e 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -39,14 +39,14 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "BKE_blender.h" -#include "BKE_context.h" -#include "BKE_main.h" - #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BKE_blender.h" +#include "BKE_context.h" +#include "BKE_main.h" + #include "RNA_access.h" #include "WM_api.h" diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 90a92dbcddc..63cde9c7d59 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -52,6 +52,9 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +#include "BLI_threads.h" +#include "BLI_blenlib.h" + #include "BKE_bmfont.h" #include "BKE_global.h" #include "BKE_image.h" @@ -62,9 +65,6 @@ #include "BKE_scene.h" #include "BKE_DerivedMesh.h" -#include "BLI_threads.h" -#include "BLI_blenlib.h" - #include "GPU_buffers.h" #include "GPU_draw.h" #include "GPU_extensions.h" diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 0ef60aaf978..e8e47013159 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -36,13 +36,12 @@ #include "MEM_guardedalloc.h" -#include "BKE_global.h" - - #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BKE_global.h" + #include "GPU_draw.h" #include "GPU_extensions.h" #include "gpu_codegen.h" diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index c408b917347..f7daf6a3b06 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -40,6 +40,8 @@ #include "DNA_sequence_types.h" #include "DNA_movieclip_types.h" +#include "BLI_math.h" + #include "BKE_animsys.h" #include "BKE_global.h" #include "BKE_sequencer.h" @@ -48,7 +50,6 @@ #include "MEM_guardedalloc.h" #include "WM_types.h" -#include "BLI_math.h" #include "BLF_translation.h" diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 14db7bddcd1..fc67ae27387 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -44,6 +44,8 @@ #include "DNA_particle_types.h" #include "DNA_scene_types.h" /* MAXFRAME only */ +#include "BLI_utildefines.h" + #include "BKE_node.h" #include "WM_api.h" 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" diff --git a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp index d03bdb74407..3e80deefecd 100644 --- a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp @@ -38,12 +38,12 @@ int tot_hints = 0; #include "MEM_guardedalloc.h" -#include "BKE_global.h" - #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" +#include "BKE_global.h" + #include "rayintersection.h" #include "rayobject.h" #include "rayobject_rtbuild.h" diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 87912f546e8..1a24055c7f4 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -38,10 +38,6 @@ #include "DNA_lamp_types.h" #include "DNA_material_types.h" -#include "BKE_global.h" -#include "BKE_scene.h" - - #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_jitter.h" @@ -49,6 +45,9 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BKE_global.h" +#include "BKE_scene.h" + #include "PIL_time.h" #include "renderpipeline.h" diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index c59c3685d7d..bf0087d0292 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -151,7 +151,7 @@ void shade_material_loop(ShadeInput *shi, ShadeResult *shr) /* do a shade, finish up some passes, apply mist */ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr) { - int compat = 0; + bool compat = false; float alpha; /* ------ main shading loop -------- */ @@ -163,7 +163,7 @@ void shade_input_do_shade(ShadeInput *shi, ShadeResult *shr) compat = ntreeShaderExecTree(shi->mat->nodetree, shi, shr); /* also run this when node shaders fail, due to incompatible shader nodes */ - if (compat == 0) { + if (compat == false) { /* copy all relevant material vars, note, keep this synced with render_types.h */ shade_input_init_material(shi); |