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 a133f92fec4618a02b77ae6012186f8d7aa3c2a6..ab50edb811e5e81504a12abff8f7b7bc05b9629e 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 da9160673025483b2f73263cf3e56b158e107bbf..b6a98faa48c7b868c7f9f83996842a6e5f8c7c09 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 62415912945e34de9809d4c5770ef5bc871c4cb2..63f5ec59a0b48f263d53b2459e718b13ed434b61 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 9b4f0a31e28a4aa612150002366be9495ee464a9..b4a3d905edb6732047a28990e81b87888400d41d 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 37b49349b8a6e271fc69d47a166955216904399a..d8ad1ceb1b13a07f4bea65a57cc9cf66a1634b40 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 0b5d0d90c677c929a0a04eea7b503740c9305d2e..159705244aa561445c7cfaeb6ce50d4e8f24d982 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 881caec8a58705f45c465d5b7481957f38e84d68..b176ed429f8e0e8a9644f384f54ccd8cd5f2ab55 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 00130dd3583f07e4535dad6a8fa9f1c762d1a32f..391891d3985eae4e557db3156ba44ef7086ea6c5 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 a00bea38e5166675823306e5ecace46355279b26..342ee5bba41866e4691c0f887bab706b400f6a5a 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 1b53f8980cb8eb60ec3c00eb1af7e7fd21e13b3a..b8d5294eabca2619b632c3d49cc0abda7cfa567a 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 53c12d32bc190456cd6eed6ccd86600730eab09d..b78ab9b28cd2620f2f47fb3e8a2fa2a720309364 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 0ffd68c907949d774339e1d8ef0b1d77c22dcddf..8b35974ea62be9444868534e7fdd392391ec5ed9 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 6201473f317d12989c878d928259aed040de5485..e652ea595d1ce9bb7c085320c9e99f056d2f0bab 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 9f770e0a9a70c969d339693ed82a3f451dbd643f..f099a79b5202d362573cebd71acc0b790f46c072 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 065dc38c81e97cdbfaa9b02ca41abd73da17d9bc..4a8601df0b8b314e7c5be73c4234f92c409efd83 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 4c23a370a5d1347cb65e062fadf514bc4e9e6be6..06af812e1a0023632945800a819a99a3023641b5 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 c283db941030848e01ec30b08b4e593ca85fc8d7..d5c451799ae4100bd6098f957bd9f586674497ab 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 66b0cff691e20ff2a96f8c0a6bdf2e85bf52d511..b862a824d50ffeb04cae0d46a4d450063dc71ed8 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 9787a5025f70cbf13182e321b1f0392b35b7b88c..03342d0f6d19a1cc5497a53eaf79cbaccbdef24b 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 1588ec10b55f257716d63b0a398842c762e61d5b..5e12b15a658feee1e4c922394708dad329d5b551 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 c440d21f56d364adfa3472927415055cb1be8e8d..7d9d2f02c067bb575415ad2a8eb960fda03a63fc 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 d137393e69884e7db145c5019328b8f7a5fa6849..4dbe0b6290ceb09c7bf7b3136028dab43b1b76c4 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 70f27db0f74ebce8e5ab196e28bb75a0531a3f45..0a195210e38c17ac74e0eebf89700aa232b8603b 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 8aab622148b8620a9a99b48f99c7388e0c2dcdeb..5bba458eb64fc896356a467ece7cbed4908ef1e0 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 2462de07a184ae9f0e3d4f595833cc0e67fbd3ca..f340bcb5b1e55db89ba662d547aabc5da6049524 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 2f54fe6cebd79ba7caa96a1793f39d7c56aa4253..ee904de4af6ca698b8359f16bd9bb75eafbca4bc 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 35d7b8d94442d035eebd4e3d83ad88d2c53156ca..4bd211395450cd340cebb576a9b628479caa94fe 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 c7e610edd9e3064bcb02788685b475c061067f7a..d98e63d88dd124e7fbc3b67da0295db6eeafc05f 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 2a750cb1a661e926f6658466d10ec15d8259b2d2..be1f4eb3a351c532f85a90b10b17862800e064e1 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 7aa956a0548d6b08f721e98491883568d7df7ec3..f3107b565b9549a8bff390990c365a46657286f5 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 e6ecdeae2e9e5074824501df0e03d6a88a013cbd..a7a6671844522f8a88bb05bfce01b6b11545cf94 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 965e8b5eec334fc2bd5e487184aacaf95aca23c2..0fccd91fc0223bd07ed1777ba6869f118fbb200a 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 0dc4d3c2db69c7b5c86f03846a154c8f79e73b04..5b5f4cf8b80b6eda2d8694c879cb080b56f5565c 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 6f4d9b2137ce4da1034c8a6466d248174bb63499..e917ccdf34269ef8ba372e300077247cfd22ee3d 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 890a2714d33e716a882106cc6f0309b3dfa49abb..974f32c511207048a2defbd223e01f9dd93a6bce 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 a7dae22cda22d9bc0b52d331361a3c589b7f0c80..eaf725dda9e592c08aeba3bd8b004841a316d0ac 100644 (file)
@@ -50,7 +50,6 @@
 
 #include "BKE_blender.h"
 #include "BKE_report.h"
-#include "BKE_utildefines.h"
 
 #include "BLI_blenlib.h"
 
index 3b502ae892bc18a550389e5165670fee4a98c77e..f8b3a548345585c65c43fbe55c192cfbd2bfd470 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 85beb6d092bb7ba9595550a2dc3fa9e2fd478125..91527313972ea9154308a5f8b8a430fa38701816 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 c47798ee804f02b3e5ea30704decd425b6b432ef..baaa6dbeed2113a78c4144beff4c4b553a6524f5 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 e171cfecc231e1a48fb5deed498de158a46b1b19..f29933ea0c18751b8569fb2d8e6a09e5187ae5c0 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 66dcec7d8e4d36e58eb6e5fd33bcae6652fa4cd6..ef714f2561fd712a2cb3a149c772463094f0b253 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 5593fe993f4a38e4ab3dec99243064569f426e82..cf211e2fbb1899e91546757516af325ee52662ff 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 e85f521def0f41d5d8c207667fe8a5bc1c81c6a8..b8cee29fee6c988d5782ab1401370829e6d100d9 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 c37830a9d92eab4bb01137f34b2c2093f1eca9d6..867053bf1d29ec8b48015cbcdab817ca6080e60e 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 0d6e5bfa61a8d777c9f3633e3ffaf7a9b23d15b0..532242c97ce9abd91b0cff7fb88007df86f338dd 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 16168888573999b387431076c45cdbbff88b2b65..86f729502bbb0f258684b23347a1ce064a76376f 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 3255bc471488086f463a4a7a375ea12fdead1b19..6ce9fc638be5f70dfb4e7362360c214074e757a7 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 a0acdd710e08ab239471fbefa50195921f8b11ab..c92b7ce2761e3ad2d2e7c276377afddea312f624 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 3883dce76710758040beda70dbd500c4274736ca..b5c0555bf63bf7e333e212056cb5fec60cc403fb 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 3d957cba517183e710f5b8e1ae13ba72958a9aaf..a1b9c0d6d077db024dc0f8e0d039bbc0fcc27662 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 dd3c2e491a7a49fba8d69f7255ee9b40e18ca8ee..1871f3c8336a3702905704ff4fdf1deb48829088 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 d895beeb184012eb1ee311cd7ab0ac233fddb801..9131c2744cd25cbe6cea26a4381ccaf4e42c31be 100644 (file)
@@ -46,7 +46,6 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
index 9fabfe009353d38784a3179dca44927d05cffafc..8f08c3afc365a5ed817ecaa57bf5303a0adbaca0 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 19ca30b9c45e1883f5782bef5293c54fa5d28778..09d89a961e40378f56b47a9130e0439ea909951e 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 1f34793a972ec0874f705866a588759ffd4ca987..b0a2a24f25ba6a52c05b5ff029928793a44e1f10 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 7a53fe247fe70ab368d0b561bfe343b197106e7f..c5722995d3278ee7fc02915a3d073cc13456b51f 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 16d10a5c41c0812b27e05d30fe3c4571ccedd105..18816924a9b0bd198770c1a76cce86f1b542c8d3 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 702e9872a918443cb059ac66674fa44303e0855c..458f0198aed20474262a326e89cb41184951b147 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 4c6b750aa411138fd519b8c32f2cdcb7a4aec543..6b960a18277a7ee51a55485900cedcea603c3ec8 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 6a234b8e29a328b0c7b7c8b55b5edaffecf17d3d..2a2aedb49ff03a4f899614ad52aec5ac8ba2cc79 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 e387a133bfb753c616c6b180b730f2ec7171ea82..cfc49d8cef5f140f9f53d2dad036b6a9f0cb7c68 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 9f9a975ab9dc180b51b3637f6bcf41df47126c23..d2ff8d13124efcfac800cc3e394bc815e1b4d7ba 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 2d19047ef893ae67da0ec9e7c85b264ecfcdb31c..75941fa224fd06334cd5664cdbe5db54ffe48371 100644 (file)
@@ -29,9 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-
 #include "RNA_define.h"
-#include "BKE_utildefines.h"
 
 #ifdef RNA_RUNTIME
 
index e84a290acb83ab1fa5febe294a915953130d391f..daa661175a1c44f1da2fda768ac1ffcecea412a3 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 96c5ff991f614088b46c03f64525bedc89ba0acf..74b3c431183b54071746a7300f99289e02491bd1 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 59eae3259b4a4c9cdc34d4873e3674540eafe95a..8a2374060cf77e7a437bcfeef470654bbcd24892 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 fff16650a93c7d4086185df3e000799f8db8fde3..d162cad72cdfdb845f817adac90027e72314ff25 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 61be48f3f02f654ba699e54b3b1ca419480bf042..69b61b47d8a3eba7abb9f207f8e58a736f86f9bc 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 ff8940129a164b1de05c3c558a8a331a77e52592..e62b3ecd80427b95a26e27601d4c82e7947ac18f 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 1c98880c3dbca8cfd3cd69e34f57c3b2e87b1eeb..9acac6d00cdbf40dd95369f42710cf7d72d30e36 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 6f3d47b342681538c526f15e49fe12378b97403c..febc4190fdfd3f4d3f81252c15358f68f84d4ed4 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 21836453eedf799dd1a7923ee49047790704f44e..3bf8b9ffacc28c5ca5aab8c64d942fef5e49f2fc 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 37444b6da92a1b7f2a345ca7a0c5d9449e98a6de..55750ca1bab395e10a26e0128a799480ff5230c0 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 399cb1d15572b84ed59a0aaa18cf8b11a215006d..2d9b934866854690e5702485921474673d19e045 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 ffa636fa952a75487a79d1d89dbb7f8bddded51e..fdbe82efeda295eafab475d04f8e9f41e24fcd6a 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 198c28edfc5d8b7c3de92ba3913fd08996f42742..ad907c317f84170ec91ce9f8c93d2a045c509068 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 9a524831388bfbcdaf2191c3aa4a789bb33a884a..48000ff258ba5522014ed8102732fa73d9b19c1d 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 ce200b34d39fe074d99700dc075853e4da67ebfe..d31f69fe8258d46b83fefdf8c4e111d994d40993 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 b842cab1d29dad00d4d584fee76f6fcdb3d8257b..8c9df496dd67a44a3526a6a3027576b04b420028 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 5f4d3f6194a200833ad8d2643178ed4ef76c9015..f9b22331f377c715b9070f5878c57101456ec67d 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 0074d6236dbb005262983d0c3c77f35f27870b37..b583c6fd7fe014ba90328c392f7aca10806f5a1e 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 80981c08c5e94e8f62f511afc9beb9f389adabab..b3c111984037bed6276de1e64f189611d17f9270 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 89a3f365140920d1944a3d2fb6abc2a127b7b3c1..9caa6bbf5792c15b7460330d3be07d97c1097304 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 f4d4f774db20c782a53a500c9d040c8482c3a242..462729356933588ff2825f08e4633cf79adea3f7 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 86928803502fcf31a18d613bbaf468e9a61ea3a8..7d29a20d1a2de021b36271ae2f6071342c4aa19e 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"