[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17947] branches/blender2.5/blender/source /blender/editors: 2.5
Ton Roosendaal
ton at blender.org
Fri Dec 19 13:48:31 CET 2008
Revision: 17947
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17947
Author: ton
Date: 2008-12-19 13:48:30 +0100 (Fri, 19 Dec 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/include/ED_types.h
branches/blender2.5/blender/source/blender/editors/include/ED_util.h
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_info/info_header.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/space_script/script_header.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c
branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_types.h 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_types.h 2008-12-19 12:48:30 UTC (rev 17947)
@@ -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 */
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_util.h 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_util.h 2008-12-19 12:48:30 UTC (rev 17947)
@@ -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);
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -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 */
Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_info/info_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_info/info_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_info/info_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -43,6 +43,7 @@
#include "ED_screen.h"
#include "ED_util.h"
+#include "ED_types.h"
#include "WM_api.h"
#include "WM_types.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_script/script_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_script/script_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_script/script_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -42,6 +42,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -44,6 +44,7 @@
#include "BKE_screen.h"
#include "ED_screen.h"
+#include "ED_types.h"
#include "ED_util.h"
#include "WM_api.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2008-12-19 12:14:58 UTC (rev 17946)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2008-12-19 12:48:30 UTC (rev 17947)
@@ -44,6 +44,7 @@
#include "ED_screen.h"
#include "ED_util.h"
+#include "ED_types.h"
#include "WM_api.h"
#include "WM_types.h"
More information about the Bf-blender-cvs
mailing list