[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50366] trunk/blender: code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later .
Campbell Barton
ideasman42 at gmail.com
Tue Sep 4 00:04:17 CEST 2012
Revision: 50366
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50366
Author: campbellbarton
Date: 2012-09-03 22:04:14 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mmap_win.c
trunk/blender/source/blender/blenfont/intern/blf_dir.c
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/runtime.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/ImageExporter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
trunk/blender/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/indexer_dv.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_camera_api.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/shader/node_shader_tree.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_result.c
trunk/blender/source/blender/render/intern/source/texture_ocean.c
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/intern/guardedalloc/intern/mmap_win.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mmap_win.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/intern/guardedalloc/intern/mmap_win.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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
Modified: trunk/blender/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_dir.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenfont/intern/blf_dir.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-09-03 22:04:14 UTC (rev 50366)
@@ -15,13 +15,6 @@
* 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 *****
*/
@@ -39,13 +32,7 @@
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
}
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -59,7 +59,6 @@
#include "BKE_main.h"
#include "BKE_library.h"
#include "BKE_report.h"
-#include "BKE_utildefines.h"
#include "RNA_access.h"
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -80,13 +80,10 @@
#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
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -4514,7 +4514,7 @@
* 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;
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -75,7 +75,6 @@
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_tracking.h"
-#include "BKE_utildefines.h"
#include "depsgraph_private.h"
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -55,7 +55,6 @@
#include "BKE_curve.h"
#include "BKE_global.h"
#include "BKE_object.h"
-#include "BKE_utildefines.h"
#include "RNA_access.h"
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -107,7 +107,6 @@
#include "BKE_gpencil.h"
#include "BKE_fcurve.h"
#include "BKE_speaker.h"
-#include "BKE_utildefines.h"
#include "BKE_movieclip.h"
#include "BKE_mask.h"
Modified: trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/mask_evaluate.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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)
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ocean.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/ocean.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -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"
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2012-09-03 20:36:26 UTC (rev 50365)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2012-09-03 22:04:14 UTC (rev 50366)
@@ -57,7 +57,6 @@
#include "BKE_packedFile.h"
#include "BKE_report.h"
#include "BKE_sound.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list