From 63195b01794e42243b1bcac01de43eccaa89fade Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 19 Dec 2008 12:48:30 +0000 Subject: 2.5 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. --- source/blender/editors/include/ED_types.h | 14 ++++++++++++++ source/blender/editors/include/ED_util.h | 8 -------- source/blender/editors/screen/area.c | 9 ++++----- source/blender/editors/space_action/action_header.c | 1 + source/blender/editors/space_buttons/buttons_header.c | 1 + source/blender/editors/space_file/file_header.c | 1 + source/blender/editors/space_image/image_header.c | 1 + source/blender/editors/space_info/info_header.c | 1 + source/blender/editors/space_ipo/ipo_header.c | 1 + source/blender/editors/space_nla/nla_header.c | 1 + source/blender/editors/space_node/node_header.c | 1 + source/blender/editors/space_outliner/outliner_header.c | 1 + source/blender/editors/space_script/script_header.c | 1 + source/blender/editors/space_sequencer/sequencer_header.c | 1 + source/blender/editors/space_sound/sound_header.c | 1 + source/blender/editors/space_text/text_header.c | 1 + source/blender/editors/space_time/time_header.c | 1 + source/blender/editors/space_view3d/view3d_edit.c | 2 ++ source/blender/editors/space_view3d/view3d_header.c | 1 + 19 files changed, 35 insertions(+), 13 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/include/ED_types.h b/source/blender/editors/include/ED_types.h index ec5dce0c70d..2ff89f97e98 100644 --- a/source/blender/editors/include/ED_types.h +++ b/source/blender/editors/include/ED_types.h @@ -35,6 +35,20 @@ #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 */ diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 885c4d3317e..ab09e7ff96a 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -30,14 +30,6 @@ /* ************** 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); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 27f70353e39..cec34155610 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -39,13 +39,14 @@ #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 */ diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c index fc0299b0851..91abdea1d32 100644 --- a/source/blender/editors/space_action/action_header.c +++ b/source/blender/editors/space_action/action_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 74e062f5888..cf090218088 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_file/file_header.c b/source/blender/editors/space_file/file_header.c index 3669249648f..296ccda156c 100644 --- a/source/blender/editors/space_file/file_header.c +++ b/source/blender/editors/space_file/file_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c index f741a7d44c0..51962a02779 100644 --- a/source/blender/editors/space_image/image_header.c +++ b/source/blender/editors/space_image/image_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_info/info_header.c b/source/blender/editors/space_info/info_header.c index 9d6c7be9898..04e78860995 100644 --- a/source/blender/editors/space_info/info_header.c +++ b/source/blender/editors/space_info/info_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_ipo/ipo_header.c b/source/blender/editors/space_ipo/ipo_header.c index bf088cb700e..1dd191e2fa7 100644 --- a/source/blender/editors/space_ipo/ipo_header.c +++ b/source/blender/editors/space_ipo/ipo_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c index a2069b1aa99..6d30615d8b1 100644 --- a/source/blender/editors/space_nla/nla_header.c +++ b/source/blender/editors/space_nla/nla_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index 5614f643578..3b11a6e05e7 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c index fd2f6fc7576..ce578e999e0 100644 --- a/source/blender/editors/space_outliner/outliner_header.c +++ b/source/blender/editors/space_outliner/outliner_header.c @@ -43,6 +43,7 @@ #include "ED_screen.h" #include "ED_util.h" +#include "ED_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_script/script_header.c b/source/blender/editors/space_script/script_header.c index 7f18f4bbbeb..9eb9d2f3f94 100644 --- a/source/blender/editors/space_script/script_header.c +++ b/source/blender/editors/space_script/script_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_sequencer/sequencer_header.c b/source/blender/editors/space_sequencer/sequencer_header.c index 26e92e67c77..34e73c23381 100644 --- a/source/blender/editors/space_sequencer/sequencer_header.c +++ b/source/blender/editors/space_sequencer/sequencer_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_sound/sound_header.c b/source/blender/editors/space_sound/sound_header.c index 1702b3e06a0..264735b2215 100644 --- a/source/blender/editors/space_sound/sound_header.c +++ b/source/blender/editors/space_sound/sound_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 47c408f0044..e347b85d709 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -42,6 +42,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c index 5faacb29654..48b29849ca3 100644 --- a/source/blender/editors/space_time/time_header.c +++ b/source/blender/editors/space_time/time_header.c @@ -44,6 +44,7 @@ #include "BKE_screen.h" #include "ED_screen.h" +#include "ED_types.h" #include "ED_util.h" #include "WM_api.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 5ac774afadb..77c3476c8cf 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -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 diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 0f4ecd2ef7b..60afab5ad5e 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -44,6 +44,7 @@ #include "ED_screen.h" #include "ED_util.h" +#include "ED_types.h" #include "WM_api.h" #include "WM_types.h" -- cgit v1.2.3