forked from bartvdbraak/blender
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.
This commit is contained in:
parent
d92b45d558
commit
63195b0179
@ -35,6 +35,20 @@
|
|||||||
#define SELECT 1
|
#define SELECT 1
|
||||||
#define ACTIVE 2
|
#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 */
|
#endif /* ED_TYPES_H */
|
||||||
|
|
||||||
|
@ -30,14 +30,6 @@
|
|||||||
|
|
||||||
/* ************** XXX OLD CRUFT WARNING ************* */
|
/* ************** 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);
|
void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert);
|
||||||
int GetButStringLength(char *str);
|
int GetButStringLength(char *str);
|
||||||
|
|
||||||
|
@ -39,13 +39,14 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
#include "BKE_utildefines.h"
|
#include "BKE_utildefines.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
|
||||||
#include "ED_screen_types.h"
|
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
#include "WM_types.h"
|
#include "WM_types.h"
|
||||||
#include "wm_subwindow.h"
|
#include "wm_subwindow.h"
|
||||||
|
|
||||||
|
#include "ED_screen.h"
|
||||||
|
#include "ED_screen_types.h"
|
||||||
|
#include "ED_types.h"
|
||||||
|
|
||||||
#include "BIF_gl.h"
|
#include "BIF_gl.h"
|
||||||
#include "BIF_glutil.h"
|
#include "BIF_glutil.h"
|
||||||
|
|
||||||
@ -57,8 +58,6 @@
|
|||||||
#include "BPY_extern.h"
|
#include "BPY_extern.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ED_util.h"
|
|
||||||
|
|
||||||
#include "screen_intern.h"
|
#include "screen_intern.h"
|
||||||
|
|
||||||
/* general area and region code */
|
/* general area and region code */
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
#include "ED_types.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
#include "WM_types.h"
|
#include "WM_types.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -44,6 +44,7 @@
|
|||||||
#include "BKE_screen.h"
|
#include "BKE_screen.h"
|
||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
|
#include "ED_types.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
|
@ -69,6 +69,8 @@
|
|||||||
#include "UI_resources.h"
|
#include "UI_resources.h"
|
||||||
#include "UI_view2d.h"
|
#include "UI_view2d.h"
|
||||||
|
|
||||||
|
#include "ED_types.h"
|
||||||
|
|
||||||
#include "PIL_time.h" /* smoothview */
|
#include "PIL_time.h" /* smoothview */
|
||||||
|
|
||||||
#include "view3d_intern.h" // own include
|
#include "view3d_intern.h" // own include
|
||||||
|
@ -44,6 +44,7 @@
|
|||||||
|
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
#include "ED_util.h"
|
#include "ED_util.h"
|
||||||
|
#include "ED_types.h"
|
||||||
|
|
||||||
#include "WM_api.h"
|
#include "WM_api.h"
|
||||||
#include "WM_types.h"
|
#include "WM_types.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user