diff options
author | Martin Poirier <theeth@yahoo.com> | 2008-10-03 00:39:57 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2008-10-03 00:39:57 +0400 |
commit | c35a2d6ea9dc5226911bd90848e96a59233bdaf8 (patch) | |
tree | be895ae3982a72a5b1cfd4ff9b1766037c07a6d0 /source/blender/include | |
parent | 39e66e4d6f48b7a54a510ec5504fd500cc07174f (diff) | |
parent | 06c43148a19ad7e8cddf9ba51549b51bdb1f6f0c (diff) |
merge trunk 16118 -> 116886
Diffstat (limited to 'source/blender/include')
31 files changed, 225 insertions, 232 deletions
diff --git a/source/blender/include/BDR_drawmesh.h b/source/blender/include/BDR_drawmesh.h index 93e08ab452d..34351549345 100644 --- a/source/blender/include/BDR_drawmesh.h +++ b/source/blender/include/BDR_drawmesh.h @@ -30,52 +30,11 @@ #ifndef BDR_DRAWMESH_H #define BDR_DRAWMESH_H -struct Image; -struct MTFace; struct Object; struct DerivedMesh; -struct Mesh; -struct EdgeHash; - -/** - * Enables or disable mipmapping for realtime images (textures). - * Note that this will will destroy all texture bindings in OpenGL. - * @see free_realtime_image() - * @param mipmap Turn mipmapping on (mipmap!=0) or off (mipmap==0). - */ -void set_mipmap(int mipmap); - -/** - * Enables or disable linear mipmap setting for realtime images (textures). - * Note that this will will destroy all texture bindings in OpenGL. - * @see free_realtime_image() - * @param mipmap Turn linear mipmapping on (linear!=0) or off (linear==0). - */ -void set_linear_mipmap(int linear); - -/** - * Returns the current setting for linear mipmapping. - */ -int get_linear_mipmap(void); - -/** - * Resets the realtime image cache variables. - */ -void clear_realtime_image_cache(void); - - -void update_realtime_image(struct Image *ima, int x, int y, int w, int h); -void free_realtime_image(struct Image *ima); -void free_all_realtime_images(void); -void make_repbind(struct Image *ima); -int set_tpage(struct MTFace *tface); - -void texpaint_enable_mipmap(void); -void texpaint_disable_mipmap(void); void draw_mesh_textured(struct Object *ob, struct DerivedMesh *dm, int facesel); -struct EdgeHash *get_tface_mesh_marked_edge_info(struct Mesh *me); -void init_realtime_GL(void); +void draw_mesh_text(struct Object *ob, int glsl); #endif /* BDR_DRAWMESH_H */ diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h index de28db64c3b..635b73af80c 100644 --- a/source/blender/include/BDR_drawobject.h +++ b/source/blender/include/BDR_drawobject.h @@ -47,8 +47,7 @@ struct EditVert; struct EditFace; struct EditEdge; -int set_gl_material(int nr); -int init_gl_materials(struct Object *ob, int check_alpha); +int draw_glsl_material(struct Object *ob, int dt); void mesh_foreachScreenVert(void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts); void mesh_foreachScreenEdge(void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts); diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h index ac60aece344..bc95c221b51 100644 --- a/source/blender/include/BDR_editobject.h +++ b/source/blender/include/BDR_editobject.h @@ -77,6 +77,8 @@ void make_links_menu(void); void make_links(short event); void make_duplilist_real(void); void apply_objects_locrot(void); +void apply_objects_scale(void); +void apply_objects_rot(void); void apply_objects_visual_tx(void); void apply_object(void); diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h index eb749cf28ec..9b9294b0343 100644 --- a/source/blender/include/BDR_gpencil.h +++ b/source/blender/include/BDR_gpencil.h @@ -43,7 +43,6 @@ struct bGPDframe; /* Temporary 'Stroke Point' data */ typedef struct tGPspoint { short x, y; /* x and y coordinates of cursor (in relative to area) */ - float xf, yf; /* same as x and y, but as floats */ float pressure; /* pressure of tablet at this point */ } tGPspoint; @@ -77,6 +76,9 @@ void gpencil_delete_laststroke(struct bGPdata *gpd); void gpencil_delete_operation(short mode); void gpencil_delete_menu(void); +void gpencil_convert_operation(short mode); +void gpencil_convert_menu(void); + //short gpencil_paint(short mousebutton); short gpencil_do_paint(struct ScrArea *sa, short mousebutton); diff --git a/source/blender/include/BDR_imagepaint.h b/source/blender/include/BDR_imagepaint.h index 26f2375e60a..bd1ac301416 100644 --- a/source/blender/include/BDR_imagepaint.h +++ b/source/blender/include/BDR_imagepaint.h @@ -34,8 +34,8 @@ void imagepaint_redraw_tool(void); void imagepaint_pick(short mousebutton); void imagepaint_paint(short mousebutton, short texturepaint); -void imagepaint_undo(); -void free_imagepaint(); +void undo_imagepaint_step(int step); +void undo_imagepaint_clear(void); #endif /* BDR_IMAGEPAINT_H */ diff --git a/source/blender/include/BIF_drawgpencil.h b/source/blender/include/BIF_drawgpencil.h index 418446313df..eacafce058d 100644 --- a/source/blender/include/BIF_drawgpencil.h +++ b/source/blender/include/BIF_drawgpencil.h @@ -28,15 +28,18 @@ #ifndef BIF_DRAWGPENCIL_H #define BIF_DRAWGPENCIL_H + +struct bGPdata; struct ScrArea; struct View3D; struct SpaceNode; struct SpaceSeq; -struct bGPdata; struct uiBlock; +struct ImBuf; short draw_gpencil_panel(struct uiBlock *block, struct bGPdata *gpd, struct ScrArea *sa); +void draw_gpencil_2dimage(struct ScrArea *sa, struct ImBuf *ibuf); void draw_gpencil_2dview(struct ScrArea *sa, short onlyv2d); void draw_gpencil_3dview(struct ScrArea *sa, short only3d); void draw_gpencil_oglrender(struct View3D *v3d, int winx, int winy); diff --git a/source/blender/include/BIF_drawseq.h b/source/blender/include/BIF_drawseq.h index 462075cdf3d..85a6c7a9e2d 100644 --- a/source/blender/include/BIF_drawseq.h +++ b/source/blender/include/BIF_drawseq.h @@ -33,6 +33,8 @@ struct ScrArea; struct Sequence; +#define SEQ_ZOOM_FAC(szoom) (szoom > 0)? (szoom) : (szoom == 0)? (1.0) : (-1.0/szoom) + void drawprefetchseqspace(struct ScrArea *sa, void *spacedata); void drawseqspace(struct ScrArea *sa, void *spacedata); void set_special_seq_update(int val); diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h index a75e0f1bd86..db2889d4e9d 100644 --- a/source/blender/include/BIF_drawtext.h +++ b/source/blender/include/BIF_drawtext.h @@ -33,6 +33,7 @@ struct ScrArea; struct SpaceText; struct Text; +struct TextLine; void unlink_text(struct Text *text); @@ -44,8 +45,8 @@ void add_text_fs(char *file); void free_txt_data(void); void pop_space_text(struct SpaceText *st); -void get_format_string(struct SpaceText *st); -void do_brackets(void); +void txt_format_text(struct SpaceText *st); +void txt_format_line(struct SpaceText *st, struct TextLine *line, int do_next); #endif diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h index 77c2f19bb9b..1425cf6a67c 100644 --- a/source/blender/include/BIF_editaction.h +++ b/source/blender/include/BIF_editaction.h @@ -78,7 +78,7 @@ enum { #define SEL_GPL(gpl) ((gpl->flag & GP_LAYER_ACTIVE) || (gpl->flag & GP_LAYER_SELECT)) #define NLA_ACTION_SCALED (G.saction->mode==SACTCONT_ACTION && G.saction->pin==0 && OBACT && OBACT->action) -#define NLA_IPO_SCALED (OBACT && OBACT->action && G.sipo->pin==0 && G.sipo->actname) +#define NLA_IPO_SCALED (OBACT && OBACT->action && G.sipo && G.sipo->pin==0 && G.sipo->actname) /* constants for setting ipo-interpolation type */ enum { diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h index 556351d7165..02d73680818 100644 --- a/source/blender/include/BIF_editarmature.h +++ b/source/blender/include/BIF_editarmature.h @@ -93,6 +93,7 @@ void free_editArmature(void); int join_armature(void); void separate_armature(void); +void apply_armature_pose2bones(void); void load_editArmature(void); void make_bone_parent(void); @@ -101,13 +102,14 @@ struct Bone *get_indexed_bone (struct Object *ob, int index); void make_editArmature(void); void make_trans_bones (char mode); +void remake_editArmature(void); +void editbones_to_armature(struct ListBase *list, struct Object *ob); int do_pose_selectbuffer(struct Base *base, unsigned int *buffer, short hits); void generateSkeleton(void); void mouse_armature(void); -void remake_editArmature(void); void selectconnected_armature(void); void selectconnected_posearmature(void); void armature_select_hierarchy(short direction, short add_to_sel); @@ -139,6 +141,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 @@ -166,3 +170,4 @@ float calcDistance(struct ReebArc *arc, int start, int end, float head[3], float #endif + diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h index 9354a577ac1..30e9e16355e 100644 --- a/source/blender/include/BIF_editmesh.h +++ b/source/blender/include/BIF_editmesh.h @@ -73,7 +73,7 @@ extern void add_primitiveMesh(int type); extern void adduplicate_mesh(void); extern void add_click_mesh(void); extern void addedgeface_mesh(void); -void addfaces_from_edgenet(); +void addfaces_from_edgenet(void); /* ******************* editmesh_lib.c */ @@ -221,7 +221,7 @@ extern void beauty_fill(void); extern void join_triangles(void); extern void edge_flip(void); extern void fill_mesh(void); -extern void bevel_menu(); +extern void bevel_menu(void); void mesh_set_face_flags(short mode); extern void mesh_set_smooth_faces(short event); extern void mesh_rotate_uvs(void); diff --git a/source/blender/include/BIF_editparticle.h b/source/blender/include/BIF_editparticle.h index 41d86565b13..aecaee31d53 100644 --- a/source/blender/include/BIF_editparticle.h +++ b/source/blender/include/BIF_editparticle.h @@ -54,7 +54,7 @@ short PE_get_current_num(struct Object *ob); int PE_minmax(float *min, float *max); void PE_get_colors(char sel[4], char nosel[4]); struct ParticleEditSettings *PE_settings(void); -struct RadialControl **PE_radialcontrol(); +struct RadialControl **PE_radialcontrol(void); /* update calls */ void PE_hide_keys_time(struct ParticleSystem *psys, float cfra); 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_editview.h b/source/blender/include/BIF_editview.h index d2c6c56d01a..204733a19d6 100644 --- a/source/blender/include/BIF_editview.h +++ b/source/blender/include/BIF_editview.h @@ -40,6 +40,7 @@ void arrows_move_cursor(unsigned short event); void lasso_select_boundbox(struct rcti *rect, short mcords[][2], short moves); int lasso_inside(short mcords[][2], short moves, short sx, short sy); int lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, int y1); +int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2); void borderselect(void); void circle_select(void); void deselectall(void); diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h index 2468abdff60..c1b3b056d62 100644 --- a/source/blender/include/BIF_gl.h +++ b/source/blender/include/BIF_gl.h @@ -49,20 +49,7 @@ #endif #endif -#ifdef __APPLE__ - #include <OpenGL/gl.h> - #include <OpenGL/glu.h> -#else -/* #if defined (__sun) || defined (__sun__) - #include <GL/gl.h> - #include <mesa/glu.h> - #else -*/ - #include <GL/gl.h> - #include <GL/glu.h> -/* #endif */ -#endif - +#include "GL/glew.h" /* * these should be phased out. cpack should be replaced in diff --git a/source/blender/include/BIF_glutil.h b/source/blender/include/BIF_glutil.h index f530e7ba8d0..ed9096549ca 100644 --- a/source/blender/include/BIF_glutil.h +++ b/source/blender/include/BIF_glutil.h @@ -204,6 +204,7 @@ void bglVertex2fv(float *vec); /* intel gfx cards frontbuffer problem */ void bglFlush(void); int is_a_really_crappy_intel_card(void); +int is_a_really_crappy_nvidia_card(void); void set_inverted_drawing(int enable); diff --git a/source/blender/include/BIF_keyframing.h b/source/blender/include/BIF_keyframing.h new file mode 100644 index 00000000000..9f85e69b77f --- /dev/null +++ b/source/blender/include/BIF_keyframing.h @@ -0,0 +1,131 @@ +/** + * $Id: BIF_keyframing.h 14444 2008-04-16 22:40:48Z aligorith $ + * + * ***** 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) 2008, Blender Foundation + * This is a new part of Blender (with some old code) + * + * Contributor(s): Joshua Leung + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef BIF_KEYFRAMING_H +#define BIF_KEYFRAMING_H + +struct ListBase; +struct ID; + +struct IpoCurve; +struct BezTriple; + +/* ************ Keyframing Management **************** */ + +/* Lesser Keyframing API call: + * Use this when validation of necessary animation data isn't necessary as it already + * exists, and there is a beztriple that can be directly copied into the array. + */ +int insert_bezt_icu(struct IpoCurve *icu, struct BezTriple *bezt); + +/* Main Keyframing API call: + * Use this when validation of necessary animation data isn't necessary as it + * already exists. It will insert a keyframe using the current value being keyframed. + */ +void insert_vert_icu(struct IpoCurve *icu, float x, float y, short flag); + + +/* flags for use by keyframe creation/deletion calls */ +enum { + /* used by isnertkey() and insert_vert_icu() */ + INSERTKEY_NEEDED = (1<<0), /* only insert keyframes where they're needed */ + INSERTKEY_MATRIX = (1<<1), /* insert 'visual' keyframes where possible/needed */ + INSERTKEY_FAST = (1<<2), /* don't recalculate handles,etc. after adding key */ + INSERTKEY_FASTR = (1<<3), /* don't realloc mem (or increase count, as array has already been set out) */ + INSERTKEY_REPLACE = (1<<4), /* only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */ + + /* used by common_*key() functions */ + COMMONKEY_ADDMAP = (1<<10), /* common key: add texture-slot offset bitflag to adrcode before use */ +} eInsertKeyFlags; + +/* -------- */ + +/* Main Keyframing API calls: + * Use this to create any necessary animation data, and then insert a keyframe + * using the current value being keyframed, in the relevant place. Returns success. + */ + // TODO: adapt this for new data-api -> this blocktype, etc. stuff is evil! +short insertkey(struct ID *id, int blocktype, char *actname, char *constname, int adrcode, short flag); + +/* Main Keyframing API call: + * Use this to delete keyframe on current frame for relevant channel. Will perform checks just in case. + */ +short deletekey(struct ID *id, int blocktype, char *actname, char *constname, int adrcode, short flag); + + +/* Main Keyframe Management calls: + * These handle keyframes management from various spaces. They will handle the menus + * required for each space. + */ +void common_insertkey(void); +void common_deletekey(void); + +/* ************ Auto-Keyframing ********************** */ +/* Notes: + * - All the defines for this (User-Pref settings and Per-Scene settings) + * are defined in DNA_userdef_types.h + * - Scene settings take presidence over those for userprefs, with old files + * inheriting userpref settings for the scene settings + * - "On/Off + Mode" are stored per Scene, but "settings" are currently stored + * as userprefs + */ + +/* Auto-Keying macros for use by various tools */ + /* check if auto-keyframing is enabled (per scene takes presidence) */ +#define IS_AUTOKEY_ON ((G.scene) ? (G.scene->autokey_mode & AUTOKEY_ON) : (U.autokey_mode & AUTOKEY_ON)) + /* check the mode for auto-keyframing (per scene takes presidence) */ +#define IS_AUTOKEY_MODE(mode) ((G.scene) ? (G.scene->autokey_mode == AUTOKEY_MODE_##mode) : (U.autokey_mode == AUTOKEY_MODE_##mode)) + /* check if a flag is set for auto-keyframing (as userprefs only!) */ +#define IS_AUTOKEY_FLAG(flag) (U.autokey_flag & AUTOKEY_FLAG_##flag) + +/* ************ Keyframe Checking ******************** */ + +/* Main Keyframe Checking API call: + * Checks whether a keyframe exists for the given ID-block one the given frame. + * - It is recommended to call this method over the other keyframe-checkers directly, + * in case some detail of the implementation changes... + * - frame: the value of this is quite often result of frame_to_float(CFRA) + */ +short id_frame_has_keyframe(struct ID *id, float frame, short filter); + +/* filter flags for id_cfra_has_keyframe + * + * WARNING: do not alter order of these, as also stored in files + * (for v3d->keyflags) + */ +enum { + /* general */ + ANIMFILTER_LOCAL = (1<<0), /* only include locally available anim data */ + ANIMFILTER_MUTED = (1<<1), /* include muted elements */ + ANIMFILTER_ACTIVE = (1<<2), /* only include active-subelements */ + + /* object specific */ + ANIMFILTER_NOMAT = (1<<9), /* don't include material keyframes */ + ANIMFILTER_NOSKEY = (1<<10), /* don't include shape keys (for geometry) */ +} eAnimFilterFlags; + +#endif /* BIF_KEYFRAMING_H */ diff --git a/source/blender/include/BIF_keyval.h b/source/blender/include/BIF_keyval.h index 70d248ded91..9693684e425 100644 --- a/source/blender/include/BIF_keyval.h +++ b/source/blender/include/BIF_keyval.h @@ -31,6 +31,9 @@ #define BIF_KEYVAL_H char *key_event_to_string(unsigned short event); +int decode_key_string(char *str, unsigned short *key, unsigned short *qual); #endif + + diff --git a/source/blender/include/BIF_meshlaplacian.h b/source/blender/include/BIF_meshlaplacian.h index 9fb8aad0eb6..71db8d0bba2 100644 --- a/source/blender/include/BIF_meshlaplacian.h +++ b/source/blender/include/BIF_meshlaplacian.h @@ -47,7 +47,7 @@ struct EditMesh; struct LaplacianSystem; typedef struct LaplacianSystem LaplacianSystem; -LaplacianSystem *laplacian_construct_begin(int totvert, int totface); +LaplacianSystem *laplacian_construct_begin(int totvert, int totface, int lsq); void laplacian_add_vertex(LaplacianSystem *sys, float *co, int pinned); void laplacian_add_triangle(LaplacianSystem *sys, int v1, int v2, int v3); diff --git a/source/blender/include/BIF_meshtools.h b/source/blender/include/BIF_meshtools.h index b08c66fd16e..a894d66cb10 100644 --- a/source/blender/include/BIF_meshtools.h +++ b/source/blender/include/BIF_meshtools.h @@ -30,6 +30,8 @@ #ifndef BIF_MESHTOOLS_H #define BIF_MESHTOOLS_H +#include "BLO_sys_types.h" + struct Object; struct EditVert; @@ -40,7 +42,7 @@ extern void objects_bake_render_menu(void); extern void objects_bake_render_ui(short event); extern void objects_bake_render(short event, char **error_msg); -extern long mesh_octree_table(struct Object *ob, float *co, char mode); +extern intptr_t mesh_octree_table(struct Object *ob, float *co, char mode); extern int mesh_get_x_mirror_vert(struct Object *ob, int index); extern struct EditVert *editmesh_get_x_mirror_vert(struct Object *ob, float *co); extern int *mesh_get_x_mirror_faces(struct Object *ob); 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/BIF_resources.h b/source/blender/include/BIF_resources.h index df514190270..b6a9882309d 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -57,8 +57,8 @@ typedef enum { ICON_TRIA_UP, ICON_FONTPREVIEW, ICON_BLANK4, - ICON_BLANK5, - ICON_BLANK6, + ICON_WORDWRAP, + ICON_WORDWRAP_OFF, ICON_ORTHO, ICON_PERSP, @@ -108,7 +108,7 @@ typedef enum { ICON_FF, ICON_REW, ICON_PYTHON, - ICON_BLANK11, + ICON_PYTHON_ON, ICON_BLANK12, ICON_BLANK13, ICON_BLANK14, @@ -266,8 +266,8 @@ typedef enum { ICON_WINDOW_WINDOW, ICON_PANEL_CLOSE, ICON_PHYSICS, - ICON_BLANK36, - ICON_BLANK37, + ICON_LAYER_USED, + ICON_LAYER_ACTIVE, ICON_BLANK38, ICON_BLENDER, @@ -524,6 +524,10 @@ enum { TH_EDGE_SHARP, TH_EDITMESH_ACTIVE, + + TH_HANDLE_VERTEX, + TH_HANDLE_VERTEX_SELECT, + TH_HANDLE_VERTEX_SIZE, }; /* XXX WARNING: previous is saved in file, so do not change order! */ diff --git a/source/blender/include/BIF_retopo.h b/source/blender/include/BIF_retopo.h index 5d39923a398..cc2fda56b07 100644 --- a/source/blender/include/BIF_retopo.h +++ b/source/blender/include/BIF_retopo.h @@ -79,27 +79,27 @@ typedef struct RetopoPaintData { struct View3D *paint_v3d; } RetopoPaintData; -RetopoPaintData *get_retopo_paint_data(); +RetopoPaintData *get_retopo_paint_data(void); -char retopo_mesh_check(); -char retopo_curve_check(); +char retopo_mesh_check(void); +char retopo_curve_check(void); -void retopo_end_okee(); +void retopo_end_okee(void); void retopo_free_paint_data(RetopoPaintData *rpd); -void retopo_free_paint(); +void retopo_free_paint(void); -char retopo_mesh_paint_check(); +char retopo_mesh_paint_check(void); void retopo_paint_view_update(struct View3D *v3d); -void retopo_force_update(); +void retopo_force_update(void); void retopo_paint_toggle(void*,void*); char retopo_paint(const unsigned short event); -void retopo_draw_paint_lines(); +void retopo_draw_paint_lines(void); RetopoPaintData *retopo_paint_data_copy(RetopoPaintData *rpd); void retopo_toggle(void*,void*); void retopo_do_vert(struct View3D *v3d, float *v); -void retopo_do_all(); +void retopo_do_all(void); void retopo_do_all_cb(void *, void *); void retopo_queue_updates(struct View3D *v3d); diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h index 4b2b8e14bb6..c7d0f4a1ada 100644 --- a/source/blender/include/BIF_space.h +++ b/source/blender/include/BIF_space.h @@ -65,6 +65,7 @@ struct SpaceOops; #define IMAGE_HANDLER_PREVIEW 33 #define IMAGE_HANDLER_GAME_PROPERTIES 34 #define IMAGE_HANDLER_VIEW_PROPERTIES 35 +#define IMAGE_HANDLER_GREASEPENCIL 36 /*#define IMAGE_HANDLER_TRANSFORM_PROPERTIES 36*/ /* action handler codes */ @@ -83,6 +84,9 @@ struct SpaceOops; /* nodes handler codes */ #define NODES_HANDLER_GREASEPENCIL 80 +/* text handler codes */ +#define TEXT_HANDLER_FIND 90 + /* theme codes */ #define B_ADD_THEME 3301 #define B_DEL_THEME 3302 diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h index 932f103a579..b8388b2172a 100644 --- a/source/blender/include/BSE_drawipo.h +++ b/source/blender/include/BSE_drawipo.h @@ -42,6 +42,7 @@ struct ScrArea; struct EditIpo; struct View2D; struct rctf; +struct SpaceLink; void calc_ipogrid(void); void draw_ipogrid(void); @@ -50,6 +51,8 @@ void areamouseco_to_ipoco (struct View2D *v2d, short *mval, float *x, float *y); void ipoco_to_areaco (struct View2D *v2d, float *vec, short *mval); void ipoco_to_areaco_noclip (struct View2D *v2d, float *vec, short *mval); +struct View2D *spacelink_get_view2d(struct SpaceLink *sl); + void view2d_do_locks (struct ScrArea *cursa, int flag); void view2d_zoom (struct View2D *v2d, float factor, int winx, int winy); void view2d_getscale (struct View2D *v2d, float *x, float *y); diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h index e6f22a4fb67..1b2834b2e3b 100644 --- a/source/blender/include/BSE_drawview.h +++ b/source/blender/include/BSE_drawview.h @@ -36,8 +36,6 @@ struct rctf; struct ScrArea; struct ImBuf; -void default_gl_light(void); -void init_gl_stuff(void); void circf(float x, float y, float rad); void circ(float x, float y, float rad); @@ -55,8 +53,8 @@ struct ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax); unsigned int sample_backbuf_rect(short mval[2], int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned int (*indextest)(unsigned int index)); void drawview3dspace(struct ScrArea *sa, void *spacedata); -void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]); -void draw_depth(struct ScrArea *sa, void *spacedata); +void drawview3d_render(struct View3D *v3d, float viewmat[][4], int winx, int winy, float winmat[][4], int shadow); +void draw_depth(struct ScrArea *sa, void *spacedata, int (*func)(void *) ); void view3d_update_depths(struct View3D *v3d); int update_time(int cfra); diff --git a/source/blender/include/BSE_editipo.h b/source/blender/include/BSE_editipo.h index e7445efc63e..807e338f514 100644 --- a/source/blender/include/BSE_editipo.h +++ b/source/blender/include/BSE_editipo.h @@ -86,13 +86,10 @@ void do_ipo_selectbuttons(void); /* gets ipo curve, creates if needed */ -struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int); -struct Ipo *verify_ipo(struct ID *, short, char *, char *, char *); +struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int, short); +struct Ipo *verify_ipo(struct ID *, short, char *, char *, char *, short); int texchannel_to_adrcode(int channel); -int insert_bezt_icu(struct IpoCurve *icu, struct BezTriple *bezt); -void insert_vert_icu(struct IpoCurve *icu, float x, float y, short fast); -void add_vert_ipo(void); void add_duplicate_editipo(void); void remove_doubles_ipo(void); @@ -121,10 +118,8 @@ void paste_editipo(void); void set_exprap_ipo(int mode); void set_speed_editipo(float speed); -void insertkey(ID *id, int blocktype, char *actname, char *constname, int adrcode, short fast); -void insertkey_smarter(ID *id, int blocktype, char *actname, char *constname, int adrcode); void insertkey_editipo(void); -void common_insertkey(void); +void add_vert_ipo(void); void free_ipokey(struct ListBase *lb); void add_to_ipokey(struct ListBase *lb, struct BezTriple *bezt, int nr, int len); void make_ipokey(void); @@ -163,8 +158,6 @@ void duplicate_ipo_keys(struct Ipo *ipo); void borderselect_ipo_key(struct Ipo *ipo, float xmin, float xmax, int val); void borderselect_icu_key(struct IpoCurve *icu, float xmin, float xmax, int (*select_function)(struct BezTriple *)); -int insertmatrixkey(ID *id, int blocktype, char *actname, char *constname, int adrcode); -void insertfloatkey(ID *id, int blocktype, char *actname, char *constname, int adrcode, float floatkey); void select_ipo_key(struct Ipo *ipo, float selx, int sel); void select_icu_key(struct IpoCurve *icu, float selx, int selectmode); void setexprap_ipoloop(struct Ipo *ipo, int code); diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 6f8b94d7cd1..50179325609 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,15 @@ #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 /* FREE 901 - 999 */ diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index 6cf010571c4..8cac5a074ab 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 - diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h index 720b856a149..51fa39ff9d6 100644 --- a/source/blender/include/transform.h +++ b/source/blender/include/transform.h @@ -466,7 +466,6 @@ int validSnappingNormal(TransInfo *t); /*********************** Generics ********************************/ void initTrans(TransInfo *t); -void initTransModeFlags(TransInfo *t, int mode); void postTrans (TransInfo *t); void drawLine(float *center, float *dir, char axis, short options); @@ -498,6 +497,7 @@ TransInfo * BIF_GetTransInfo(void); /*********************** NumInput ********************************/ +void initNumInput(NumInput *n); void outputNumInput(NumInput *n, char *str); short hasNumInput(NumInput *n); void applyNumInput(NumInput *n, float *vec); |