[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54088] trunk/blender/source/blender: header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree

Campbell Barton ideasman42 at gmail.com
Thu Jan 24 22:57:16 CET 2013


Revision: 54088
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54088
Author:   campbellbarton
Date:     2013-01-24 21:57:13 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    trunk/blender/source/blender/blenkernel/BKE_main.h
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/blenkernel/intern/bvhutils.c
    trunk/blender/source/blender/blenkernel/intern/ocean.c
    trunk/blender/source/blender/blenlib/BLI_math_base.h
    trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/screen/glutil.c
    trunk/blender/source/blender/editors/space_clip/clip_editor.c
    trunk/blender/source/blender/editors/space_node/node_select.c
    trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
    trunk/blender/source/blender/makesrna/intern/rna_texture.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
    trunk/blender/source/blender/nodes/intern/node_exec.c
    trunk/blender/source/blender/nodes/intern/node_exec.h
    trunk/blender/source/blender/nodes/shader/node_shader_tree.c
    trunk/blender/source/blender/nodes/shader/node_shader_util.h
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_common.c
    trunk/blender/source/blender/nodes/texture/node_texture_util.h
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
    trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    trunk/blender/source/blender/render/intern/source/shadbuf.c
    trunk/blender/source/blender/render/intern/source/shadeinput.c

Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2013-01-24 21:57:13 UTC (rev 54088)
@@ -731,4 +731,4 @@
 	return (j != ORIGINDEX_NONE) ? (index_mp_to_orig ? index_mp_to_orig[j] : j) : ORIGINDEX_NONE;
 }
 
-#endif
+#endif  /* __BKE_DERIVEDMESH_H__ */

Modified: trunk/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_main.h	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenkernel/BKE_main.h	2013-01-24 21:57:13 UTC (rev 54088)
@@ -99,5 +99,4 @@
 }
 #endif
 
-#endif
-
+#endif  /* __BKE_MAIN_H__ */

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2013-01-24 21:57:13 UTC (rev 54088)
@@ -577,7 +577,7 @@
 
 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);
 

Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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 */

Modified: trunk/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ocean.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenkernel/intern/ocean.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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 @@
 	/* unused */
 	(void)update_cb;
 }
-#endif /* WITH_OCEANSIM */
\ No newline at end of file
+#endif /* WITH_OCEANSIM */

Modified: trunk/blender/source/blender/blenlib/BLI_math_base.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_base.h	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/blenlib/BLI_math_base.h	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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

Modified: trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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"
 

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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 @@
 
 #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);

Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/editors/screen/glutil.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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"
 

Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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"

Modified: trunk/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_select.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/editors/space_node/node_select.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -30,14 +30,14 @@
 
 #include "DNA_node_types.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 "BLI_rect.h"
-#include "BLI_lasso.h"
-#include "BLI_utildefines.h"
-
 #include "ED_node.h"  /* own include */
 #include "ED_screen.h"
 #include "ED_types.h"

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ops.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -39,14 +39,14 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.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 "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
 #include "RNA_access.h"
 
 #include "WM_api.h"

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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"

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-01-24 20:54:12 UTC (rev 54087)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-01-24 21:57:13 UTC (rev 54088)
@@ -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"
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list