code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 3 Sep 2012 22:04:14 +0000 (22:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 3 Sep 2012 22:04:14 +0000 (22:04 +0000)
85 files changed:
intern/guardedalloc/intern/mmap_win.c
source/blender/blenfont/intern/blf_dir.c
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mask_evaluate.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/seqmodifier.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_path_util.h
source/blender/blenlib/intern/BLI_mempool.c
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/storage.c
source/blender/blenlib/intern/winstuff.c
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/runtime.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/ImageExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/compositor/nodes/COM_OutputFileNode.cpp
source/blender/compositor/operations/COM_AntiAliasOperation.cpp
source/blender/compositor/operations/COM_OutputFileOperation.h
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_general.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/util/ed_util.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/IMB_indexer.h
source/blender/imbuf/intern/indexer.c
source/blender/imbuf/intern/indexer_dv.c
source/blender/imbuf/intern/thumbs.c
source/blender/imbuf/intern/thumbs_blend.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_camera_api.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_texture_api.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/nodes/composite/nodes/node_composite_outputFile.c
source/blender/nodes/intern/node_common.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/texture_ocean.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_playanim.c
source/creator/creator.c
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp

index a133f92..ab50edb 100644 (file)
@@ -44,7 +44,7 @@
 #define FILE_MAP_EXECUTE 0x0020
 #endif
 
-/* copied from BKE_utildefines.h ugh */
+/* copied from BLI_utildefines.h, ugh */
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else
index da91606..b6a98fa 100644 (file)
@@ -41,8 +41,6 @@
 
 #include "DNA_vec_types.h"
 
-#include "BKE_utildefines.h"
-
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_path_util.h"
index 6241591..63f5ec5 100644 (file)
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
  * ***** END GPL LICENSE BLOCK *****
  */
 
 extern "C" {
 #endif
 
-/* these values need to be hardcoded in structs, dna does not recognize defines */
-/* also defined in DNA_space_types.h */
-#ifndef FILE_MAXDIR
-#define FILE_MAXDIR         768
-#define FILE_MAXFILE        256
-#define FILE_MAX            1024
-#endif
+/* currently unused but we may want to add macros here for BKE later */
 
 #ifdef __cplusplus
 }
index 9b4f0a3..b4a3d90 100644 (file)
@@ -63,7 +63,6 @@
 #include "BKE_object.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 #include "BKE_depsgraph.h"
 #include "BKE_anim.h"
index 37b4934..d8ad1ce 100644 (file)
@@ -59,7 +59,6 @@
 #include "BKE_main.h"
 #include "BKE_library.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 0b5d0d9..1597052 100644 (file)
 #include "BKE_sound.h"
 #include "RE_pipeline.h"
 
-
 #include "BLO_undofile.h"
 #include "BLO_readfile.h" 
 #include "BLO_writefile.h" 
 
-#include "BKE_utildefines.h"
-
 #include "RNA_access.h"
 
 #include "WM_api.h" // XXXXX BAD, very BAD dependency (bad level call) - remove asap, elubie
index 881caec..b176ed4 100644 (file)
@@ -50,7 +50,6 @@
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_paint.h"
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 #include "BKE_curve.h"
 
index 00130dd..391891d 100644 (file)
@@ -4514,7 +4514,7 @@ static void con_relink_id_cb(bConstraint *UNUSED(con), ID **idpoin, short UNUSED
         * since we've got the actual ID block, let's just inline this
         * code. 
         *
-        * See ID_NEW(a) in BKE_utildefines.h
+        * See ID_NEW(a) in DNA_ID.h
         */
        if ((*idpoin) && (*idpoin)->newid)
                (*idpoin) = (void *)(*idpoin)->newid;
index a00bea3..342ee5b 100644 (file)
@@ -51,7 +51,6 @@
 #include "BLI_mempool.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_customdata.h"
 #include "BKE_customdata_file.h"
 #include "BKE_global.h"
index 1b53f89..b8d5294 100644 (file)
@@ -75,7 +75,6 @@
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_tracking.h"
-#include "BKE_utildefines.h"
 
 #include "depsgraph_private.h"
  
index 53c12d3..b78ab9b 100644 (file)
@@ -55,7 +55,6 @@
 #include "BKE_curve.h" 
 #include "BKE_global.h"
 #include "BKE_object.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 0ffd68c..8b35974 100644 (file)
@@ -50,7 +50,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_packedFile.h"
 #include "BKE_library.h"
 #include "BKE_font.h"
index 6201473..e652ea5 100644 (file)
@@ -79,7 +79,6 @@
 #include "BKE_scene.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h" /* seq_foreground_frame_get() */
-#include "BKE_utildefines.h"
 
 #include "BLF_api.h"
 
index 9f770e0..f099a79 100644 (file)
 #include "BKE_gpencil.h"
 #include "BKE_fcurve.h"
 #include "BKE_speaker.h"
-#include "BKE_utildefines.h"
 #include "BKE_movieclip.h"
 #include "BKE_mask.h"
 
index 065dc38..4a8601d 100644 (file)
@@ -61,7 +61,6 @@
 #include "BKE_sequencer.h"
 #include "BKE_tracking.h"
 #include "BKE_movieclip.h"
-#include "BKE_utildefines.h"
 
 
 unsigned int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
index 4c23a37..06af812 100644 (file)
@@ -69,7 +69,6 @@
 #include "BKE_library.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
-#include "BKE_utildefines.h"
 #include "BKE_movieclip.h"
 #include "BKE_image.h"  /* openanim */
 #include "BKE_tracking.h"
index c283db9..d5c4517 100644 (file)
@@ -58,8 +58,6 @@
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
-#include "BKE_utildefines.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 66b0cff..b862a82 100644 (file)
@@ -37,8 +37,6 @@
 
 #include "BKE_image.h"
 #include "BKE_ocean.h"
-#include "BKE_utildefines.h"
-
 #include "BKE_global.h" // XXX TESTING
 
 #include "BLI_math_base.h"
index 9787a50..03342d0 100644 (file)
@@ -57,7 +57,6 @@
 #include "BKE_packedFile.h"
 #include "BKE_report.h"
 #include "BKE_sound.h"
-#include "BKE_utildefines.h"
 
 #ifdef _WIN32
 #define open _open
index 1588ec1..5e12b15 100644 (file)
@@ -69,7 +69,6 @@
 #include "BKE_scene.h"
 #include "BKE_smoke.h"
 #include "BKE_softbody.h"
-#include "BKE_utildefines.h"
 
 #include "BIK_api.h"
 
index c440d21..7d9d2f0 100644 (file)
@@ -44,7 +44,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_library.h"
index d137393..4dbe0b6 100644 (file)
@@ -49,7 +49,6 @@
 #include "BKE_main.h"
 #include "BKE_sequencer.h"
 #include "BKE_texture.h"
-#include "BKE_utildefines.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index 70f27db..0a19521 100644 (file)
@@ -43,7 +43,6 @@
 
 #include "BKE_colortools.h"
 #include "BKE_sequencer.h"
-#include "BKE_utildefines.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 8aab622..5bba458 100644 (file)
@@ -62,7 +62,6 @@
 #include "BKE_fcurve.h"
 #include "BKE_scene.h"
 #include "BKE_mask.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 2462de0..f340bcb 100644 (file)
@@ -50,7 +50,6 @@
 #  include "AUD_C-API.h"
 #endif
 
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_sound.h"
index 2f54fe6..ee904de 100644 (file)
@@ -56,7 +56,6 @@
 
 #include "IMB_imbuf.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_ocean.h"
index 35d7b8d..4bd2113 100644 (file)
@@ -193,6 +193,14 @@ void BLI_system_temporary_dir(char *dir);
 void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
 #endif
 
+/* these values need to be hardcoded in structs, dna does not recognize defines */
+/* also defined in DNA_space_types.h */
+#ifndef FILE_MAXDIR
+#  define FILE_MAXDIR         768
+#  define FILE_MAXFILE        256
+#  define FILE_MAX            1024
+#endif
+
 #ifdef __cplusplus
 }
 #endif
index c7e610e..d98e63d 100644 (file)
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* note: copied from BKE_utildefines.h, don't use here because we're in BLI */
+/* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */
 #ifdef __BIG_ENDIAN__
 /* Big Endian */
 #  define MAKE_ID(a, b, c, d) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d) )
index 2a750cb..be1f4eb 100644 (file)
@@ -78,7 +78,6 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
-#include "BKE_utildefines.h"
 #include "BKE_image.h" /* so we can check the image's type */
 
 static int checkMissingFiles_visit_cb(void *userdata, char *UNUSED(path_dst), const char *path_src)
index 7aa956a..f3107b5 100644 (file)
@@ -60,8 +60,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
-
 #include "BLO_sys_types.h" // for intptr_t support
 
 
index e6ecdea..a7a6671 100644 (file)
@@ -47,7 +47,6 @@
 #include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_blender.h"    // BLENDER_VERSION
 
 #include "GHOST_Path-api.h"
index 965e8b5..0fccd91 100644 (file)
 
 #include "BLI_listbase.h"
 #include "BLI_linklist.h"
-#include "BLI_fileops.h"
-
-#include "BLI_fileops_types.h"
 #include "BLI_string.h"
 #include "BLI_fileops.h"
-
-#include "BKE_utildefines.h"
+#include "BLI_fileops_types.h"
+#include "BLI_path_util.h"
 
 /* vars: */
 static int totnum, actnum;
index 0dc4d3c..5b5f4cf 100644 (file)
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 
 #define WIN32_SKIP_HKEY_PROTECTION      // need to use HKEY
 #include "BLI_winstuff.h"
 #include "BLI_utildefines.h"
+#include "BLI_path_util.h"
 
 #include "utf_winfunc.h"
 #include "utfconv.h"
index 6f4d9b2..e917ccd 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
 #include "BLI_fileops.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
-#include "BLI_utildefines.h"
 
 #include "DNA_genfile.h"
 #include "DNA_sdna_types.h"
@@ -55,7 +56,6 @@
 #include "BKE_library.h" // for free_main
 #include "BKE_idcode.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
 
 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
index 890a271..974f32c 100644 (file)
 #include "BKE_sequencer.h"
 #include "BKE_text.h" // for txt_extended_ascii_as_utf8
 #include "BKE_tracking.h"
-#include "BKE_utildefines.h"
 #include "BKE_sound.h"
 
 #include "IMB_imbuf.h"  // for proxy / timecode versioning stuff
index a7dae22..eaf725d 100644 (file)
@@ -50,7 +50,6 @@
 
 #include "BKE_blender.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
 
 #include "BLI_blenlib.h"
 
index 3b502ae..f8b3a54 100644 (file)
@@ -154,7 +154,6 @@ Any case: direct data is ALWAYS after the lib block
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
 #include "BKE_subsurf.h"
-#include "BKE_utildefines.h"
 #include "BKE_modifier.h"
 #include "BKE_fcurve.h"
 #include "BKE_pointcache.h"
index 85beb6d..9152731 100644 (file)
@@ -38,7 +38,6 @@
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 #include "BKE_bmesh.h"
 
index c47798e..baaa6db 100644 (file)
@@ -99,7 +99,6 @@ extern char build_rev[];
 #include "BKE_action.h" // pose functions
 #include "BKE_armature.h"
 #include "BKE_image.h"
-#include "BKE_utildefines.h"
 #include "BKE_object.h"
 
 #include "BLI_math.h"
index e171cfe..f29933e 100644 (file)
@@ -62,13 +62,13 @@ extern "C" {
 #include "BKE_texture.h"
 #include "BKE_fcurve.h"
 #include "BKE_depsgraph.h"
-#include "BLI_path_util.h"
 #include "BKE_scene.h"
 #include "BKE_global.h"
 #include "BKE_material.h"
-#include "BKE_utildefines.h"
 #include "BKE_image.h"
 
+#include "BLI_path_util.h"
+
 #include "DNA_camera_types.h"
 #include "DNA_lamp_types.h"
 
index 66dcec7..ef714f2 100644 (file)
@@ -39,7 +39,6 @@ extern "C" {
 #include "BKE_image.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
-#include "BKE_utildefines.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
index 5593fe9..cf211e2 100644 (file)
@@ -570,7 +570,7 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me)
        if (loose_edge_count > 0) {
 
                unsigned int face_edge_count  = me->totedge;
-               unsigned int total_edge_count = loose_edge_count + face_edge_count;
+               /* unsigned int total_edge_count = loose_edge_count + face_edge_count; */ /* UNUSED */
                
                mesh_add_edges(me, loose_edge_count);
                MEdge *med = me->medge + face_edge_count;
index e85f521..b8cee29 100644 (file)
@@ -24,8 +24,8 @@
 #include "COM_OutputFileNode.h"
 #include "COM_OutputFileOperation.h"
 #include "COM_ExecutionSystem.h"
+
 #include "BLI_path_util.h"
-#include "BKE_utildefines.h"
 
 OutputFileNode::OutputFileNode(bNode *editorNode) : Node(editorNode)
 {
index c37830a..867053b 100644 (file)
@@ -23,7 +23,6 @@
 #include "COM_AntiAliasOperation.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BKE_utildefines.h"
 
 #include "MEM_guardedalloc.h"
 
index 0d6e5bf..532242c 100644 (file)
@@ -24,8 +24,9 @@
 #ifndef _COM_OutputFileOperation_h
 #define _COM_OutputFileOperation_h
 #include "COM_NodeOperation.h"
+
 #include "BLI_rect.h"
-#include "BKE_utildefines.h"
+#include "BLI_path_util.h"
 
 #include "intern/openexr/openexr_multi.h"
 
index 1616888..86f7295 100644 (file)
@@ -61,7 +61,6 @@
 #include "BKE_curve.h"
 #include "BKE_key.h"
 #include "BKE_context.h"
-#include "BKE_utildefines.h" /* FILE_MAX */
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
index 3255bc4..6ce9fc6 100644 (file)
@@ -50,7 +50,6 @@
 #include "BKE_global.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index a0acdd7..c92b7ce 100644 (file)
@@ -89,7 +89,6 @@
 #include "BKE_node.h"
 #include "BKE_mask.h"
 #include "BKE_sequencer.h"
-#include "BKE_utildefines.h"
 
 #include "ED_anim_api.h"
 #include "ED_markers.h"
index 3883dce..b5c0555 100644 (file)
@@ -45,7 +45,6 @@
 
 
 #include "BKE_fcurve.h"
-#include "BKE_utildefines.h"
 #include "BKE_report.h"
 #include "BKE_library.h"
 #include "BKE_global.h"
index 3d957cb..a1b9c0d 100644 (file)
 #include "DNA_userdef_types.h"
 
 #include "BLI_math.h"
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_string_utf8.h"
+#include "BLI_path_util.h"
+#include "BLI_rect.h"
+
 #include "BLI_dynstr.h"
 #include "BLI_utildefines.h"
 
@@ -50,7 +55,6 @@
 #include "BKE_unit.h"
 #include "BKE_screen.h"
 #include "BKE_idprop.h"
-#include "BKE_utildefines.h" /* FILE_MAX */
 
 #include "BIF_gl.h"
 
index dd3c2e4..1871f3c 100644 (file)
@@ -59,7 +59,6 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
-#include "BKE_utildefines.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index d895bee..9131c27 100644 (file)
@@ -46,7 +46,6 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 9fabfe0..8f08c3a 100644 (file)
@@ -290,7 +290,7 @@ static void knife_add_edge_faces_to_vert(KnifeTool_OpData *kcd, KnifeVert *kfv,
 }
 
 /* Find a face in common in the two faces lists.
  If more than one, return the first; if none, return NULL */
* If more than one, return the first; if none, return NULL */
 static BMFace *knife_find_common_face(ListBase *faces1, ListBase *faces2)
 {
        Ref *ref1, *ref2;
index 19ca30b..09d89a9 100644 (file)
 #include "DNA_view3d_types.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_path_util.h"
 #include "BLI_array.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index 1f34793..b0a2a24 100644 (file)
@@ -45,7 +45,6 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
-#include "BKE_utildefines.h"
 #include "BKE_packedFile.h"
 
 #include "ED_armature.h"
index 7a53fe2..c572299 100644 (file)
@@ -57,7 +57,6 @@ extern "C" {
 #include "BKE_global.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
-#include "BKE_utildefines.h"
 #include "BKE_constraint.h"
 #include "DNA_object_types.h"
 #include "DNA_action_types.h"
index 16d10a5..1881692 100644 (file)
@@ -31,7 +31,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "BKE_utildefines.h"
 #include "IMB_anim.h"
 /*
  * separate animation index files to solve the following problems:
index 702e987..458f019 100644 (file)
 
 #include <stdlib.h>
 
-#include "IMB_indexer.h"
-#include "IMB_anim.h"
-#include "AVI_avi.h"
-#include "imbuf.h"
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
+#include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
 #include "BLI_math_base.h"
 
+#include "IMB_indexer.h"
+#include "IMB_anim.h"
+#include "AVI_avi.h"
+#include "imbuf.h"
+
 #include "MEM_guardedalloc.h"
 #include "DNA_userdef_types.h"
 #include "BKE_global.h"
index 4c6b750..6b960a1 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "IMB_indexer.h"
 #include "MEM_guardedalloc.h"
+
 #include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+
+#include "IMB_indexer.h"
 #include <time.h>
 
 typedef struct indexer_dv_bitstream {
index 6a234b8..2a2aedb 100644 (file)
@@ -39,8 +39,6 @@
 #include "BLI_fileops.h"
 #include "BLI_md5.h"
 
-#include "BKE_utildefines.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_thumbs.h"
index e387a13..cfc49d8 100644 (file)
@@ -37,7 +37,6 @@
 
 #include "BLO_blend_defs.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 
 #include "IMB_imbuf_types.h"
index 9f9a975..d2ff8d1 100644 (file)
@@ -51,7 +51,7 @@
 #  define __func__ __FUNCTION__
 #endif
 
-/* copied from BKE_utildefines.h ugh */
+/* copied from BLI_utildefines.h ugh */
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else
index 2d19047..75941fa 100644 (file)
@@ -29,9 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-
 #include "RNA_define.h"
-#include "BKE_utildefines.h"
 
 #ifdef RNA_RUNTIME
 
index e84a290..daa6611 100644 (file)
  *  \ingroup RNA
  */
 
-
 #include <stdlib.h>
 
+#include "DNA_object_fluidsim.h"
+
+#include "BLI_path_util.h"
+
 #include "RNA_define.h"
 
 #include "rna_internal.h"
 
-#include "DNA_object_fluidsim.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
index 96c5ff9..74b3c43 100644 (file)
  *  \ingroup RNA
  */
 
-
 #include <stdlib.h>
 #include <string.h>
 
+#include "BLI_path_util.h"
+
 #include "RNA_define.h"
 
 #include "rna_internal.h"
 
-#include "BKE_utildefines.h"
-
 #ifdef RNA_RUNTIME
 
 #include "BKE_main.h"
index 59eae32..8a23740 100644 (file)
 
 #include "DNA_ID.h"
 
+#include "BLI_path_util.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
-#include "rna_internal.h"
 
-#include "BKE_utildefines.h"
+#include "rna_internal.h"
 
 #ifdef RNA_RUNTIME
 
index fff1665..d162cad 100644 (file)
  *  \ingroup RNA
  */
 
-
 #include <stdlib.h>
 
 #include "DNA_scene_types.h"
 
+#include "BLI_path_util.h"
+
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
@@ -37,7 +38,6 @@
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 
-#include "BKE_utildefines.h"
 
 #ifdef RNA_RUNTIME
 
index 61be48f..69b61b4 100644 (file)
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "BLI_path_util.h"
+
 #include "RNA_define.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "BKE_utildefines.h"
-
 
 #ifdef RNA_RUNTIME
 
index ff89401..e62b3ec 100644 (file)
  *  \ingroup RNA
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "BLI_path_util.h"
 
 #include "RNA_define.h"
-#include "BKE_utildefines.h"
 
 #ifdef RNA_RUNTIME
 
index 1c98880..9acac6d 100644 (file)
@@ -51,7 +51,6 @@
 #include "BKE_fluidsim.h" /* ensure definitions here match */
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
-#include "BKE_utildefines.h"
 #include "BKE_global.h" /* G.main->name only */
 
 #include "MOD_fluidsim_util.h"
index 6f3d47b..febc419 100644 (file)
@@ -43,7 +43,6 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 
 #include "MEM_guardedalloc.h"
index 2183645..3bf8b9f 100644 (file)
@@ -37,7 +37,6 @@
 #include "BKE_global.h"
 #include "BKE_modifier.h"
 #include "BKE_ocean.h"
-#include "BKE_utildefines.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 37444b6..55750ca 100644 (file)
@@ -48,7 +48,6 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_tracking.h"
-#include "BKE_utildefines.h"
 
 #include "node_common.h"
 #include "node_exec.h"
index 399cb1d..2d9b934 100644 (file)
@@ -33,8 +33,6 @@
 #include <string.h>
 #include "BLI_path_util.h"
 
-#include "BKE_utildefines.h"
-
 #include "node_composite_util.h"
 
 #include "IMB_imbuf.h"
index ffa636f..fdbe82e 100644 (file)
@@ -45,7 +45,6 @@
 #include "BKE_main.h"
 #include "BLI_math.h"
 #include "BKE_node.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 #include "RNA_types.h"
index 198c28e..ad907c3 100644 (file)
@@ -49,7 +49,6 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_scene.h"
-#include "BKE_utildefines.h"
 
 #include "GPU_material.h"
 
index 9a52483..48000ff 100644 (file)
@@ -55,7 +55,6 @@
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
-#include "BKE_utildefines.h"
 #include "BKE_writeavi.h"  /* <------ should be replaced once with generic movie module */
 
 #include "BLI_math.h"
index ce200b3..d31f69f 100644 (file)
@@ -38,7 +38,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
 
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
index b842cab..8c9df49 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "BKE_modifier.h"
 #include "BKE_ocean.h"
-#include "BKE_utildefines.h"
 
 #include "render_types.h"
 #include "RE_shader_ext.h"
index 5f4d3f6..f9b2233 100644 (file)
@@ -115,7 +115,6 @@ struct ImBuf;
 
 #include "RNA_types.h"
 #include "DNA_listBase.h"
-#include "BKE_utildefines.h" /* FILE_MAX */
 
 /* exported types for WM */
 #include "wm_cursors.h"
index 0074d62..b583c6f 100644 (file)
@@ -61,7 +61,6 @@
 
 #include "BKE_blender.h"
 #include "BKE_global.h"
-#include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
index 80981c0..b3c1119 100644 (file)
@@ -68,7 +68,6 @@
 
 #include "BLI_blenlib.h"
 
-#include "BKE_utildefines.h"
 #include "BKE_blender.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h" /* for DAG_on_visible_update */
index 89a3f36..9caa6bb 100644 (file)
@@ -82,8 +82,7 @@
 #include "BKE_text.h"
 #include "BLI_blenlib.h"
 #include "BLI_math_base.h"
-
-#define FILE_MAX 1024 // repeated here to avoid dependency from BKE_utildefines.h
+#include "BLI_path_util.h"
 
 #include "KX_NetworkMessageActuator.h"
 
index f4d4f77..4627293 100644 (file)
@@ -98,7 +98,6 @@ extern char datatoc_bfont_ttf[];
 #include "RAS_IRasterizer.h"
 
 #include "BKE_main.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_define.h"
 
index 8692880..7d29a20 100644 (file)
@@ -133,7 +133,6 @@ extern "C" {
 
 #include "PHY_IPhysicsEnvironment.h"
 #include "BKE_main.h"
-#include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BLI_blenlib.h"
 #include "GPU_material.h"