diff options
Diffstat (limited to 'source/blender/include')
| -rw-r--r-- | source/blender/include/BIF_editarmature.h | 3 | ||||
| -rw-r--r-- | source/blender/include/BIF_editseq.h | 1 | ||||
| -rw-r--r-- | source/blender/include/BIF_outliner.h | 5 | ||||
| -rw-r--r-- | source/blender/include/blendef.h | 46 | ||||
| -rw-r--r-- | source/blender/include/butspace.h | 3 | ||||
| -rw-r--r-- | source/blender/include/license_key.h | 92 |
6 files changed, 18 insertions, 132 deletions
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h index fdd00a67465..d390b96f61f 100644 --- a/source/blender/include/BIF_editarmature.h +++ b/source/blender/include/BIF_editarmature.h @@ -139,6 +139,8 @@ void hide_selected_armature_bones(void); void hide_unselected_armature_bones(void); void show_all_armature_bones(void); +void align_selected_bones(void); + #define BONESEL_ROOT 0x10000000 #define BONESEL_TIP 0x20000000 #define BONESEL_BONE 0x40000000 @@ -157,3 +159,4 @@ void show_all_armature_bones(void); #endif + diff --git a/source/blender/include/BIF_editseq.h b/source/blender/include/BIF_editseq.h index b353e7bb45c..be30a3eaaf3 100644 --- a/source/blender/include/BIF_editseq.h +++ b/source/blender/include/BIF_editseq.h @@ -52,6 +52,7 @@ struct Sequence* find_next_prev_sequence(struct Sequence *test, int lr, int sel) struct Sequence* find_nearest_seq(int *hand); int insert_gap(int gap, int cfra); void make_meta(void); +void select_single_seq(struct Sequence *seq, int deselect_all); void select_channel_direction(struct Sequence *test,int lr); void select_more_seq(void); void select_less_seq(void); diff --git a/source/blender/include/BIF_outliner.h b/source/blender/include/BIF_outliner.h index abf8b58b1c9..fcd206bb828 100644 --- a/source/blender/include/BIF_outliner.h +++ b/source/blender/include/BIF_outliner.h @@ -41,7 +41,7 @@ typedef struct TreeElement { short idcode; // from TreeStore id short xend; // width of item display, for select char *name; - void *directdata; // Armature Bones, Base, ... + void *directdata; // Armature Bones, Base, Sequence, Strip... } TreeElement; /* TreeElement->flag */ @@ -77,6 +77,9 @@ typedef struct TreeElement { #define TSE_LINKED_LAMP 23 #define TSE_POSEGRP_BASE 24 #define TSE_POSEGRP 25 +#define TSE_SEQUENCE 26 +#define TSE_SEQ_STRIP 27 +#define TSE_SEQUENCE_DUP 28 /* outliner search flags */ #define OL_FIND 0 diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index a7f7bc2e4b8..7f1b0f234dd 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 @@ -265,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 */ @@ -275,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 @@ -290,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 @@ -319,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 @@ -359,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 */ @@ -370,8 +349,6 @@ /* 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 @@ -395,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 @@ -436,9 +411,8 @@ #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 /* FREE 901 - 999 */ diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index b8c3584a45e..2dca5e4eb9d 100644 --- a/source/blender/include/butspace.h +++ b/source/blender/include/butspace.h @@ -281,9 +281,6 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la #define B_SOFTBODY_BAKE 1422 #define B_SOFTBODY_BAKE_FREE 1423 -/* this has MAX_EFFECT settings! Next free define is 1450... */ -#define B_SELEFFECT 1430 - /* Fluidsim button defines */ #define B_FLUIDSIM_BAKE 1450 #define B_FLUIDSIM_SELDIR 1451 diff --git a/source/blender/include/license_key.h b/source/blender/include/license_key.h deleted file mode 100644 index 7dc14f45e74..00000000000 --- a/source/blender/include/license_key.h +++ /dev/null @@ -1,92 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef LICENCEKEY_H -#define LICENCEKEY_H - -#define I_AM_PUBLISHER temp_val2 -#define LICENSE_KEY_VALID temp_val -#define SHOW_LICENSE_KEY rotop - -extern int LICENSE_KEY_VALID; -extern int I_AM_PUBLISHER; - -extern char * license_key_name; -extern void loadKeyboard(char * name); -extern void checkhome(void); -extern void SHOW_LICENSE_KEY(void); - -#define LICENSE_CHECK_0 (0==0) - -// Stuff from the Python files from Strubi - -typedef int (*Fptr)(void *); - -extern Fptr g_functab[]; -extern Fptr g_ptrtab[]; - -// TODO: From here on, this should be a generated header file... - -// change all KEY_FUNC values -// if you change PYKEY_TABLEN or PYKEY_SEED -// see below - -#define PYKEY_TABLEN 21 // don't change this unless needed. Other values - // may yield bad random orders - -#define PYKEY_SEED {26,8,1972} - -// these values are generated by $HOME/develop/intern/keymaker/makeseed.py -// from the above seed value. - -// DO NOT EDIT THESE VALUES BY HAND! - -#define KEY_FUNC1 12 -#define KEY_FUNC2 8 -#define KEY_FUNC3 1 -#define KEY_FUNC4 16 -#define KEY_FUNC5 20 -#define KEY_FUNC6 18 -#define KEY_FUNC7 13 -#define KEY_FUNC8 6 -#define KEY_FUNC9 9 -#define KEY_FUNC10 7 -#define KEY_FUNC11 14 -#define KEY_FUNC12 0 -#define KEY_FUNC13 5 -#define KEY_FUNC14 10 -#define KEY_FUNC15 19 -#define KEY_FUNC16 2 -#define KEY_FUNC17 11 -#define KEY_FUNC18 3 -#define KEY_FUNC19 17 -#define KEY_FUNC20 15 -#define KEY_FUNC21 4 - -#endif - |