diff options
Diffstat (limited to 'source/blender/include/blendef.h')
| -rw-r--r-- | source/blender/include/blendef.h | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 6f8b94d7cd1..60d3a589c51 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -42,8 +42,6 @@ #define MAXSEQ 32 /* in buttons.c */ -#define MAX_EFFECT 20 - #ifndef MAXFLOAT #define MAXFLOAT ((float)3.40282347e+38) #endif @@ -67,8 +65,6 @@ #define RET_OK 0 #define RET_ERROR 1 #define RET_CANCEL 2 -#define RET_YES (1 == 1) -#define RET_NO (1 == 0) #if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__) /* big endian */ @@ -90,7 +86,6 @@ #define VERSE 3 /*#endif*/ #define DESELECT 0 -#define NOT_YET 0 #define VISIBLE 0 #define LAST 0 @@ -113,6 +108,7 @@ #define F_CFRA ((float)(G.scene->r.cfra)) #define SFRA (G.scene->r.sfra) #define EFRA (G.scene->r.efra) +#define STFRA (G.scene->frame_step) #define PSFRA ((G.scene->r.psfra != 0)? (G.scene->r.psfra): (G.scene->r.sfra)) #define PEFRA ((G.scene->r.psfra != 0)? (G.scene->r.pefra): (G.scene->r.efra)) #define FRA2TIME(a) ((((double) G.scene->r.frs_sec_base) * (a)) / G.scene->r.frs_sec) @@ -127,9 +123,9 @@ /* for curve objects in editmode that can have hidden handles - may use for IPO's later */ #define BEZSELECTED_HIDDENHANDLES(bezt) ((G.f & G_HIDDENHANDLES) ? (bezt)->f2 & SELECT : BEZSELECTED(bezt)) -/* psfont */ -#define FNT_PDRAW 1 -#define FNT_HAEBERLI 2 +#define BEZ_SEL(bezt) { (bezt)->f1 |= SELECT; (bezt)->f2 |= SELECT; (bezt)->f3 |= SELECT; } +#define BEZ_DESEL(bezt) { (bezt)->f1 &= ~SELECT; (bezt)->f2 &= ~SELECT; (bezt)->f3 &= ~SELECT; } +#define BEZ_INVSEL(bezt) { (bezt)->f1 ^= SELECT; (bezt)->f2 ^= SELECT; (bezt)->f3 ^= SELECT; } /* getbutton */ @@ -171,7 +167,6 @@ /* EVENT < 50: alones en locals */ #define B_KEEPDATA 60 -#define B_CONSOLETOG 61 #define B_DRAWINFO 62 #define B_REDRCURW3D 63 #define B_FLIPINFOMENU 64 @@ -219,12 +214,10 @@ /* watch: codes 102-132 in in use for layers */ #define B_AUTOKEY 139 #define B_SCENELOCK 140 -#define B_LOCALVIEW 141 #define B_U_CAPSLOCK 142 #define B_VIEWBUT 146 #define B_PERSP 147 -#define B_PROPTOOL 148 #define B_VIEWRENDER 149 #define B_STARTGAME 150 @@ -241,6 +234,7 @@ #define B_SEL_END 168 #define B_MAN_MODE 169 #define B_NDOF 170 +#define B_VIEW_BUTSEDIT 171 /* IPO: 200 */ #define B_IPOHOME 201 @@ -264,9 +258,8 @@ /* OOPS: 250 */ #define B_OOPSHOME 251 -#define B_OOPSBORDER 252 -#define B_NEWOOPS 253 -#define B_OOPSVIEWSEL 254 +#define B_NEWOOPS 252 +#define B_OOPSVIEWSEL 253 /* INFO: 300 */ /* watch: also in filesel.c and editobject.c */ @@ -274,8 +267,6 @@ #define B_INFODELSCR 302 #define B_INFOSCE 304 #define B_INFODELSCE 305 -#define B_FILEMENU 306 -#define B_PACKFILE 307 #define B_CONSOLEOUT 308 #define B_CONSOLENUMLINES 309 @@ -289,11 +280,7 @@ #define B_RESTOREFONT 317 #define B_USETEXTUREFONT 318 -#define B_UITHEMECHANGED 320 -#define B_UITHEMECOLORMOD 321 #define B_UITHEMERESET 322 -#define B_UITHEMEIMPORT 323 -#define B_UITHEMEEXPORT 324 #define B_MEMCACHELIMIT 325 #define B_WPAINT_RANGE 326 @@ -318,15 +305,9 @@ #define B_SIMAGELOAD 353 #define B_SIMA_REDR_IMA_3D 354 #define B_SIMAGETILE 355 -#define B_BE_SQUARE 356 #define B_TWINANIM 357 -#define B_SIMAGEREPLACE 358 -#define B_CLIP_UV 359 -#define B_SIMAGELOAD1 360 -#define B_SIMAGEREPLACE1 361 #define B_SIMAGEPAINTTOOL 362 #define B_SIMAPACKIMA 363 -#define B_SIMAGESAVE 364 #define B_SIMACLONEBROWSE 365 #define B_SIMACLONEDELETE 366 #define B_SIMANOTHING 368 @@ -358,8 +339,7 @@ #define B_BUTSPREVIEW 402 #define B_MATCOPY 403 #define B_MATPASTE 404 -#define B_MESHTYPE 405 -#define B_CONTEXT_SWITCH 406 +#define B_CONTEXT_SWITCH 405 /* IMASEL: 450 */ /* in imasel.h - not any more - elubie */ @@ -369,14 +349,19 @@ /* TEXT: 500 */ #define B_TEXTBROWSE 501 -#define B_TEXTALONE 502 -#define B_TEXTLOCAL 503 #define B_TEXTDELETE 504 #define B_TEXTFONT 505 #define B_TEXTSTORE 506 #define B_TEXTLINENUM 507 #define B_TAB_NUMBERS 508 #define B_SYNTAX 509 +#define B_WORDWRAP 510 +#define B_TEXTPLUGINS 511 +#define B_PASTEFIND 512 +#define B_PASTEREPLACE 513 +#define B_TEXTREPLACE 514 +#define B_TEXTFIND 515 +#define B_TEXTMARKALL 516 /* SCRIPT: 525 */ #define B_SCRIPTBROWSE 526 @@ -387,14 +372,12 @@ #define B_RELOADDIR 552 /* SEQUENCE: 600 */ -#define B_SEQHOME 601 -#define B_SEQCLEAR 602 +#define B_SEQCLEAR 601 /* SOUND: 650 */ #define B_SOUNDBROWSE 651 #define B_SOUNDBROWSE2 652 #define B_SOUNDHOME 653 -#define B_PACKSOUND 654 /* ACTION: 701 - 750 */ #define B_ACTHOME 701 @@ -423,14 +406,16 @@ #define B_TL_NEXTKEY 755 #define B_TL_STOP 756 #define B_TL_PREVIEWON 757 +#define B_TL_INSERTKEY 758 +#define B_TL_DELETEKEY 759 /* NLA: 801-850 */ #define B_NLAHOME 801 /* NODE: 851-900 */ -#define B_NODEHOME 851 -#define B_NODE_USEMAT 852 -#define B_NODE_USESCENE 853 +#define B_NODE_USEMAT 851 +#define B_NODE_USESCENE 852 +#define B_NODE_USETEX 853 /* FREE 901 - 999 */ |