[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34335] trunk/blender/source/blender: remove/comment unused defines.
Campbell Barton
ideasman42 at gmail.com
Sat Jan 15 17:14:59 CET 2011
Revision: 34335
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34335
Author: campbellbarton
Date: 2011-01-15 16:14:57 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
remove/comment unused defines.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
trunk/blender/source/blender/blenlib/BLI_math.h
trunk/blender/source/blender/blenlib/BLI_math_base.h
trunk/blender/source/blender/blenlib/BLI_math_color.h
trunk/blender/source/blender/blenlib/BLI_math_geom.h
trunk/blender/source/blender/blenlib/BLI_math_inline.h
trunk/blender/source/blender/blenlib/BLI_math_matrix.h
trunk/blender/source/blender/blenlib/BLI_math_rotation.h
trunk/blender/source/blender/blenlib/BLI_math_vector.h
trunk/blender/source/blender/blenlib/BLI_storage_types.h
trunk/blender/source/blender/blenlib/intern/math_base_inline.c
trunk/blender/source/blender/blenlib/intern/math_geom_inline.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/imbuf/intern/IMB_anim.h
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h
trunk/blender/source/blender/makesdna/DNA_camera_types.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/DNA_view3d_types.h
trunk/blender/source/blender/makesdna/DNA_world_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/python/generic/bgl.h
trunk/blender/source/blender/python/generic/mathutils.h
trunk/blender/source/blender/python/generic/mathutils_color.h
trunk/blender/source/blender/python/generic/mathutils_euler.h
trunk/blender/source/blender/python/generic/mathutils_geometry.h
trunk/blender/source/blender/python/generic/mathutils_matrix.h
trunk/blender/source/blender/python/generic/mathutils_quat.h
trunk/blender/source/blender/python/generic/mathutils_vector.h
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -125,17 +125,17 @@
#define G_FILE_ENABLE_ALL_FRAMES (1 << 3) /* deprecated */
#define G_FILE_SHOW_DEBUG_PROPS (1 << 4) /* deprecated */
#define G_FILE_SHOW_FRAMERATE (1 << 5) /* deprecated */
-#define G_FILE_SHOW_PROFILE (1 << 6) /* deprecated */
+/* #define G_FILE_SHOW_PROFILE (1 << 6) */ /* deprecated */
#define G_FILE_LOCK (1 << 7)
#define G_FILE_SIGN (1 << 8)
-#define G_FIle_PUBLISH (1 << 9)
+/* #define G_FILE_PUBLISH (1 << 9) */ /* deprecated */
#define G_FILE_NO_UI (1 << 10)
-#define G_FILE_GAME_TO_IPO (1 << 11) /* deprecated */
+/* #define G_FILE_GAME_TO_IPO (1 << 11) */ /* deprecated */
#define G_FILE_GAME_MAT (1 << 12) /* deprecated */
-#define G_FILE_DISPLAY_LISTS (1 << 13) /* deprecated */
+/* #define G_FILE_DISPLAY_LISTS (1 << 13) */ /* deprecated */
#define G_FILE_SHOW_PHYSICS (1 << 14) /* deprecated */
#define G_FILE_GAME_MAT_GLSL (1 << 15) /* deprecated */
-#define G_FILE_GLSL_NO_LIGHTS (1 << 16) /* deprecated */
+/* #define G_FILE_GLSL_NO_LIGHTS (1 << 16) */ /* deprecated */
#define G_FILE_GLSL_NO_SHADERS (1 << 17) /* deprecated */
#define G_FILE_GLSL_NO_SHADOWS (1 << 18) /* deprecated */
#define G_FILE_GLSL_NO_RAMPS (1 << 19) /* deprecated */
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -94,10 +94,6 @@
/* reload only frees, doesn't read until image_get_ibuf() called */
#define IMA_SIGNAL_RELOAD 0
#define IMA_SIGNAL_FREE 1
- /* pack signals are executed */
-#define IMA_SIGNAL_PACK 2
-#define IMA_SIGNAL_REPACK 3
-#define IMA_SIGNAL_UNPACK 4
/* source changes, from image to sequence or movie, etc */
#define IMA_SIGNAL_SRC_CHANGE 5
/* image-user gets a new image, check settings */
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -61,7 +61,6 @@
#define DATA MAKE_ID('D','A','T','A')
#define GLOB MAKE_ID('G','L','O','B')
-#define IMAG MAKE_ID('I','M','A','G')
#define DNA1 MAKE_ID('D','N','A','1')
#define TEST MAKE_ID('T','E','S','T') /* used as preview between 'REND' and 'GLOB' */
Modified: trunk/blender/source/blender/blenlib/BLI_math.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH
-#define BLI_MATH
+#ifndef BLI_MATH_H
+#define BLI_MATH_H
/* Abbreviations:
*
@@ -60,5 +60,5 @@
#include "BLI_math_vector.h"
#include "BLI_math_geom.h"
-#endif /* BLI_MATH */
+#endif /* BLI_MATH_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_base.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_base.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_base.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_BASE
-#define BLI_MATH_BASE
+#ifndef BLI_MATH_BASE_H
+#define BLI_MATH_BASE_H
#ifdef __cplusplus
extern "C" {
@@ -140,7 +140,7 @@
#define CLAMP(a, b, c) if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
#endif
-#ifdef BLI_MATH_INLINE
+#ifdef BLI_MATH_INLINE_H
#include "intern/math_base_inline.c"
#endif
@@ -173,5 +173,5 @@
}
#endif
-#endif /* BLI_MATH_BASE */
+#endif /* BLI_MATH_BASE_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_color.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_color.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_color.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_COLOR
-#define BLI_MATH_COLOR
+#ifndef BLI_MATH_COLOR_H
+#define BLI_MATH_COLOR_H
#ifdef __cplusplus
extern "C" {
@@ -102,5 +102,5 @@
}
#endif
-#endif /* BLI_MATH_COLOR */
+#endif /* BLI_MATH_COLOR_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_geom.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_geom.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_geom.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_GEOM
-#define BLI_MATH_GEOM
+#ifndef BLI_MATH_GEOM_H
+#define BLI_MATH_GEOM_H
#ifdef __cplusplus
extern "C" {
@@ -34,7 +34,7 @@
#include "BLI_math_inline.h"
-#ifdef BLI_MATH_INLINE
+#ifdef BLI_MATH_INLINE_H
#include "intern/math_geom_inline.c"
#endif
@@ -208,5 +208,5 @@
}
#endif
-#endif /* BLI_MATH_GEOM */
+#endif /* BLI_MATH_GEOM_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_inline.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_inline.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_inline.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -33,9 +33,9 @@
#endif
/* add platform/compiler checks here if it is not supported */
-#define BLI_MATH_INLINE
+#define BLI_MATH_INLINE_H
-#ifdef BLI_MATH_INLINE
+#ifdef BLI_MATH_INLINE_H
#ifdef _MSC_VER
#define MINLINE static __forceinline
#define MALWAYS_INLINE MINLINE
Modified: trunk/blender/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_MATRIX
-#define BLI_MATH_MATRIX
+#ifndef BLI_MATH_MATRIX_H
+#define BLI_MATH_MATRIX_H
#ifdef __cplusplus
extern "C" {
@@ -172,5 +172,5 @@
}
#endif
-#endif /* BLI_MATH_MATRIX */
+#endif /* BLI_MATH_MATRIX_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_rotation.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_rotation.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_rotation.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_ROTATION
-#define BLI_MATH_ROTATION
+#ifndef BLI_MATH_ROTATION_H
+#define BLI_MATH_ROTATION_H
#ifdef __cplusplus
extern "C" {
@@ -180,5 +180,5 @@
}
#endif
-#endif /* BLI_MATH_ROTATION */
+#endif /* BLI_MATH_ROTATION_H */
Modified: trunk/blender/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_vector.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_math_vector.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
-#ifndef BLI_MATH_VECTOR
-#define BLI_MATH_VECTOR
+#ifndef BLI_MATH_VECTOR_H
+#define BLI_MATH_VECTOR_H
#ifdef __cplusplus
extern "C" {
@@ -34,7 +34,7 @@
#include "BLI_math_inline.h"
-#ifdef BLI_MATH_INLINE
+#ifdef BLI_MATH_INLINE_H
#include "intern/math_vector_inline.c"
#endif
@@ -184,5 +184,5 @@
}
#endif
-#endif /* BLI_MATH_VECTOR */
+#endif /* BLI_MATH_VECTOR_H */
Modified: trunk/blender/source/blender/blenlib/BLI_storage_types.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_storage_types.h 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/BLI_storage_types.h 2011-01-15 16:14:57 UTC (rev 34335)
@@ -67,14 +67,6 @@
struct ImBuf *image;
};
-#define SELECT 1
-#define HIDDEN 1
-#define FIRST 1
-#define DESELECT 0
-#define NOT_YET 0
-#define VISIBLE 0
-#define LAST 0
-
struct dirlink
{
struct dirlink *next,*prev;
Modified: trunk/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2011-01-15 16:14:57 UTC (rev 34335)
@@ -32,8 +32,8 @@
#include "BLI_math.h"
-#ifndef BLI_MATH_BASE_INLINE
-#define BLI_MATH_BASE_INLINE
+#ifndef BLI_MATH_BASE_INLINE_H
+#define BLI_MATH_BASE_INLINE_H
/* A few small defines. Keep'em local! */
#define SMALL_NUMBER 1.e-8
@@ -127,5 +127,5 @@
return (f < 0.f)? -1.f: 1.f;
}
-#endif /* BLI_MATH_BASE_INLINE */
+#endif /* BLI_MATH_BASE_INLINE_H */
Modified: trunk/blender/source/blender/blenlib/intern/math_geom_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom_inline.c 2011-01-15 15:48:46 UTC (rev 34334)
+++ trunk/blender/source/blender/blenlib/intern/math_geom_inline.c 2011-01-15 16:14:57 UTC (rev 34335)
@@ -27,8 +27,8 @@
#include "BLI_math.h"
-#ifndef BLI_MATH_GEOM_INLINE
-#define BLI_MATH_GEOM_INLINE
+#ifndef BLI_MATH_GEOM_INLINE_H
+#define BLI_MATH_GEOM_INLINE_H
/****************************** Spherical Harmonics **************************/
@@ -134,5 +134,5 @@
add_sh_shsh(r, r, tmp);
}
-#endif /* BLI_MATH_GEOM_INLINE */
+#endif /* BLI_MATH_GEOM_INLINE_H */
Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list