2.5
authorTon Roosendaal <ton@blender.org>
Fri, 19 Dec 2008 12:48:30 +0000 (12:48 +0000)
committerTon Roosendaal <ton@blender.org>
Fri, 19 Dec 2008 12:48:30 +0000 (12:48 +0000)
Compile fix; MAXFLOAT is not defined uniformly on platforms.
Note for the coders:

ED_types.h: has editor wide defines and structs
ED_util.h: has editor wide functions

Both includes also are containing old cruft to get things
to compile (and work), for later cleanup.

19 files changed:
source/blender/editors/include/ED_types.h
source/blender/editors/include/ED_util.h
source/blender/editors/screen/area.c
source/blender/editors/space_action/action_header.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_file/file_header.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_info/info_header.c
source/blender/editors/space_ipo/ipo_header.c
source/blender/editors/space_nla/nla_header.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_outliner/outliner_header.c
source/blender/editors/space_script/script_header.c
source/blender/editors/space_sequencer/sequencer_header.c
source/blender/editors/space_sound/sound_header.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_header.c

index ec5dce0c70d39d07ab3a3ed58107ecebdfc19d99..2ff89f97e98cf20ca4a6dc9073a9b2e5c9e07c74 100644 (file)
 #define SELECT  1
 #define ACTIVE  2
 
+/* nonstandard define, sometimes in math.h */
+#ifndef MAXFLOAT
+#define MAXFLOAT  ((float)3.40282347e+38)
+#endif
+
+/* buttons */
+#define XIC 20
+#define YIC 20
+
+/* proposal = put scene pointers on function calls? */
+#define BASACT                    (scene->basact)
+#define OBACT                     (BASACT? BASACT->object: 0)
+
+
 
 #endif /* ED_TYPES_H */
 
index 885c4d3317e923f273c8b4b97085a67bf64dca67..ab09e7ff96ae74837a79dd0dab40f4648b72d02b 100644 (file)
 
 /* ************** XXX OLD CRUFT WARNING ************* */
 
-#define XIC 20
-#define YIC 20
-
-/* proposal = put scene pointers on function calls? */
-#define BASACT                    (scene->basact)
-#define OBACT                     (BASACT? BASACT->object: 0)
-
-
 void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert);
 int GetButStringLength(char *str);
 
index 27f70353e39042d536844af0db67e1eccbafb1f1..cec34155610cd25d9c2affbf0f21785d076ced4d 100644 (file)
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "ED_screen.h"
-#include "ED_screen_types.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 #include "wm_subwindow.h"
 
+#include "ED_screen.h"
+#include "ED_screen_types.h"
+#include "ED_types.h"
+
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
@@ -57,8 +58,6 @@
 #include "BPY_extern.h"
 #endif
 
-#include "ED_util.h"
-
 #include "screen_intern.h"
 
 /* general area and region code */
index fc0299b0851dec43815f2da2a6f85801accea5d0..91abdea1d329e430718f9221e6d646dea4402ed0 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 74e062f5888d0fdd192948feeb6ec70a1421b34d..cf0902180884a546be95fa042d297a0b21f7c252 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 3669249648f2a7efe73f0e4f84fa93db9a7f31e3..296ccda156c29c0e5d0a95c250f4b6a0bd14af35 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index f741a7d44c0f63ab1f891517c43b1a81f32a395c..51962a02779136960d095f7dbfef6f3c722b9298 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 9d6c7be9898a8bade6e97e2d0da99c7408d12f0e..04e7886099553d9468c6950b699b33381a6ba331 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index bf088cb700e11254241f44a9442bd9f852a19695..1dd191e2fa7d23013c4c2b666f4a18d6fffa86d9 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index a2069b1aa997f36b1dcb4a90e50189a9b43eff03..6d30615d8b104cd0389b67dbaedd175384248620 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 5614f643578933a17fb8fc94a1dff23f5ccbf5d5..3b11a6e05e70333ff5cf9eb935743f674b3283b3 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index fd2f6fc7576e9862b14ab01635bbba6d6c18a7bc..ce578e999e045a460c26a9f8614287f6db559074 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "ED_screen.h"
 #include "ED_util.h"
+#include "ED_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 7f18f4bbbeb45b942d32736b26991f6e29e5f2af..9eb9d2f3f948cb961b6e0ac9b72de36b0a2df63f 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 26e92e67c77459a6b4e5e0e0629b57a6dd03f2c7..34e73c23381a62a44c73e2aa4e69592d1448dd21 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 1702b3e06a0b5f7072decf81f753863776745300..264735b22155279f810c454e20d70a777328c02b 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 47c408f0044c69edc75ffafbca55ef5b861e71d4..e347b85d709c4fbc6cc874f4e544f44e05aea4dc 100644 (file)
@@ -42,6 +42,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 5faacb29654cad61716c416e95aa84f4ce4fab31..48b29849ca33c9e40cebdc95f543aa347e586416 100644 (file)
@@ -44,6 +44,7 @@
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_types.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
index 5ac774afadbcb36908fd0124235191c4820a676e..77c3476c8cf6a2700700c408cbcad079253412cd 100644 (file)
@@ -69,6 +69,8 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
+#include "ED_types.h"
+
 #include "PIL_time.h" /* smoothview */
 
 #include "view3d_intern.h"     // own include
index 0f4ecd2ef7b24ef3cb74f3260769fdf8bb56e032..60afab5ad5e6184a0258313607a0334394cb0d87 100644 (file)
@@ -44,6 +44,7 @@
 
 #include "ED_screen.h"
 #include "ED_util.h"
+#include "ED_types.h"
 
 #include "WM_api.h"
 #include "WM_types.h"