diff options
Diffstat (limited to 'source/blender/src')
59 files changed, 297 insertions, 125 deletions
diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index c91a3438f6d..de22bddc426 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -78,6 +78,9 @@ #include "mydevice.h" #include "butspace.h" // own module +/************************ function prototypes ***************************/ +void drawbutspace(ScrArea *, void *); + /* Local vars ---------------------------------------------------------- */ short bgpicmode=0, near=1000, far=1000; diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 40e3ff37e4a..c6f095c7a6d 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -165,6 +165,10 @@ short uv_calc_mapdir= 1, uv_calc_mapalign= 1, facesel_draw_edges= 0; extern ListBase editNurb; + +/* *************************** static functions prototypes ****************** */ +void validate_editbonebutton(EditBone *); + /* *************************** MESH DECIMATE ******************************** */ /* should be removed from this c file (ton) */ diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 61c57ea8596..58285ffd775 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -82,6 +82,9 @@ #include "BIF_keyval.h" #include "BIF_editsound.h" +#include "BIF_editsca.h" + + #include "BDR_editcurve.h" #include "BSE_buttons.h" #include "BSE_headerbuttons.h" @@ -93,6 +96,8 @@ #include "butspace.h" // own module /* internals */ +void buttons_enji(uiBlock *, Object *); +void buttons_ketsji(uiBlock *, Object *); /****/ diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 716a3f448bc..3813001e5e3 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -71,6 +71,8 @@ #include "BDR_editcurve.h" #include "BDR_drawobject.h" +//#include "BIF_editsca.h" + #include "BIF_butspace.h" #include "mydevice.h" @@ -133,14 +135,21 @@ static float prspeed=0.0; float prlen=0.0; +/* ********************* function prototypes ******************** */ +void object_panel_draw(Object *); +void object_panel_hooks(Object *); +void object_panel_effects(Object *); /* ********************* CONSTRAINT ***************************** */ +#if 0 static void add_influence_key_to_constraint_func (void *arg1v, void *unused) { bConstraint *con = arg1v; add_influence_key_to_constraint(con); } +#endif + static void activate_constraint_ipo_func (void *arg1v, void *unused) { diff --git a/source/blender/src/buttons_script.c b/source/blender/src/buttons_script.c index 94013132f78..78eba064faa 100644 --- a/source/blender/src/buttons_script.c +++ b/source/blender/src/buttons_script.c @@ -112,6 +112,8 @@ #include "blendef.h" #include "butspace.h" +/* ************************ function prototypes ********************** */ +void draw_scriptlink(uiBlock *, ScriptLink *, int , int , int ) ; diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 4fb27b01328..335d60c3c91 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -106,6 +106,14 @@ #include "butspace.h" // own module +/* ---------function prototypes ------------- */ +void load_tex_image(char *); +void load_plugin_tex(char *); +int vergcband(const void *, const void *); +void save_env(char *); +void drawcolorband(ColorBand *, float , float , float , float ); + + static MTex mtexcopybuf; static MTex emptytex; static int packdummy = 0; diff --git a/source/blender/src/cursors.c b/source/blender/src/cursors.c index f254156c307..47751348a33 100644 --- a/source/blender/src/cursors.c +++ b/source/blender/src/cursors.c @@ -115,11 +115,11 @@ void SetBlenderCursor(short curs){ } } - +/* unused no prototypes short GetCurrentCursor(void){ return(CurrentCursor); } - +*/ void InitCursorData(void){ diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 664fd63ce86..b331c3c3bca 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -102,6 +102,10 @@ static void draw_keylist(gla2DDrawInfo *di, int totvert, BezTriple **blist, floa void draw_icu_channel(gla2DDrawInfo *di, IpoCurve *icu, int flags, float ypos); static void draw_action_mesh_names(Key *key); +/* missing local prototypes -------------------------------------------- */ +void meshactionbuts(SpaceAction *saction, Key *key); +void do_actionbuts(unsigned short event); + /* implementation ------------------------------------------------------ */ extern void make_rvk_slider(uiBlock *block, Key *key, int i, @@ -696,10 +700,11 @@ void drawactionspace(ScrArea *sa, void *spacedata) curarea->win_swap= WIN_BACK_OK; } - +/* unused and blank void draw_channel_name(const char* name, short type, float ypos, int selected) { } +*/ static void draw_keylist(gla2DDrawInfo *di, int totvert, BezTriple **blist, float ypos) { diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index 03ec40a3638..fe0f6e461f1 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -78,6 +78,8 @@ /* GLOBALS */ extern char *fsmenu; +void rectwrite_imasel(int , int , int , int , int , int , int , int , float , float , unsigned int *); + void rectwrite_imasel(int winxmin, int winymin, int winxmax, int winymax, int x1, int y1, int xim, int yim, float zoomx, float zoomy, unsigned int *rect) { int cx, cy, oldxim, x2, y2; diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c index cadd6ed20b1..77b7f21bdda 100644 --- a/source/blender/src/drawipo.c +++ b/source/blender/src/drawipo.c @@ -2070,7 +2070,8 @@ EditIpo *select_proj_ipo(rctf *rectf, int event) /* this was IGLuint, but it's a useless typedef... */ GLuint buffer[MAXPICKBUF]; int a, b; - int code, hits; + int hits; + unsigned int code; short mval[2]; G.f |= G_PICKSEL; diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index cc6c3ae7558..feb1e50d94e 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -117,6 +117,10 @@ static short fTexwindx, fTexwindy, fTexwinsx, fTexwinsy; static int fDoMipMap = 1; static int fLinearMipMap = 0; +/* local prototypes --------------- */ +void update_realtime_textures(void); + + /* static int source, dest; also not used */ /** diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index c300e90982f..65dd72c0348 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3505,7 +3505,7 @@ static void tekentextcurs(void) glEnd(); } -void drawspiral(float *cent, float rad, float tmat[][4], int start) +static void drawspiral(float *cent, float rad, float tmat[][4], int start) { float vec[3], vx[3], vy[3]; int a, tot=32; @@ -4499,7 +4499,9 @@ void draw_object(Base *base) /* Drawing the constraint lines */ list = &ob->constraints; if (list){ + /* extern void make_axis_color(char *col, char *col2, char axis); // drawview.c + */ bConstraint *curcon; float size[3], tmat[4][4]; char col[4], col2[4]; diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index 66dc405daca..b2659941397 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -203,7 +203,7 @@ static void drawmeta_contents(Sequence *seqm, float x1, float y1, float x2, floa END_SEQ } -void drawseqwave(Sequence *seq, float x1, float y1, float x2, float y2) +static void drawseqwave(Sequence *seq, float x1, float y1, float x2, float y2) { float f, height, midy; int offset, sofs, eofs; diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index e6e9ea598e1..2acd68a66f3 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -89,6 +89,12 @@ void drawtextspace(ScrArea *sa, void *spacedata); void winqreadtextspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); +/* missing locals */ +void txt_copy_selectbuffer (Text *text); +void txt_paste_clipboard(Text *text); /* blank on non Win32 */ +void txt_copy_clipboard(Text *text); /* blank on non Win32 */ + + static void *last_txt_find_string= NULL; static BMF_Font *spacetext_get_font(SpaceText *st) { diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index 7328eb5b4db..f647ebb66e0 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -121,6 +121,10 @@ extern void uvedit_selectionCB(short selecting, Object *editobj, void circle_selectCB(select_CBfunc func); +/* local protos ---------------*/ +void snap_curs_to_firstsel(void); + + int get_border(rcti *rect, short col) { float dvec[4], fac1, fac2; @@ -931,7 +935,7 @@ void snap_curs_to_sel() #ifdef __NLA if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0); #else - if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MABLL) make_trans_verts(bmat[0], bmat[1], 0); + if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0); #endif if(tottrans==0) return; diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 32110fa88e5..6c77ea2e976 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -104,7 +104,7 @@ extern int count_action_levels (bAction *act); #define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1)) -/* Local Function prototypes */ +/* Local Function prototypes, some are forward needed */ static void insertactionkey(bAction *act, bActionChannel *achan, bPoseChannel *chan, int adrcode, short makecurve, float time); static void flip_name (char *name); @@ -117,6 +117,11 @@ static void delete_actionchannels(void); static void select_poseelement_by_name (char *name, int select); static void hilight_channel (bAction *act, bActionChannel *chan, short hilight); static void set_action_key_time (bAction *act, bPoseChannel *chan, int adrcode, short makecurve, float time); + +static void remake_meshaction_ipos(Ipo *ipo); +static void select_all_keys_frames(bAction *act, short *mval, short *mvalo, int selectmode); +static void select_all_keys_channels(bAction *act, short *mval, short *mvalo, int selectmode); + /* Implementation */ short showsliders = 0; @@ -291,7 +296,7 @@ void remake_action_ipos(bAction *act) } } -void remake_meshaction_ipos(Ipo *ipo) +static void remake_meshaction_ipos(Ipo *ipo) { /* this puts the bezier triples in proper * order and makes sure the bezier handles @@ -1944,7 +1949,7 @@ void set_ipotype_actionchannels(int ipotype) { allqueue(REDRAWNLA, 0); } -void select_all_keys_frames(bAction *act, short *mval, +static void select_all_keys_frames(bAction *act, short *mval, short *mvalo, int selectmode) { /* This function tries to select all action keys in @@ -2020,7 +2025,7 @@ void select_all_keys_frames(bAction *act, short *mval, } -void select_all_keys_channels(bAction *act, short *mval, +static void select_all_keys_channels(bAction *act, short *mval, short *mvalo, int selectmode) { bActionChannel *chan; float click, x,y; diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index b4406044c56..c7c10489cc1 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -69,6 +69,7 @@ #include "BKE_global.h" #include "BKE_object.h" #include "BKE_subsurf.h" +#include "BKE_deform.h" #include "BIF_gl.h" #include "BIF_graphics.h" @@ -141,6 +142,15 @@ static EditBone * get_nearest_editbonepoint (int findunsel, int *selmask); static Bone *get_first_selected_bonechildren (Bone *bone); +static EditBone *get_named_editbone(char *name); +static void update_dup_subtarget(EditBone *dupBone); +static int bone_skinnable(Object *ob, Bone *bone, void *data); +static int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data); +static int dgroup_skinnable(Object *ob, Bone *bone, void *data); +static void add_verts_to_closest_dgroup(Object *ob, Object *par); +static int hide_selected_pose_bone(Object *ob, Bone *bone, void *ptr); +static int hide_unselected_pose_bone(Object *ob, Bone *bone, void *ptr); +static int show_pose_bone(Object *ob, Bone *bone, void *ptr); /* Functions */ @@ -2005,7 +2015,7 @@ void addvert_armature(void) } -EditBone *get_named_editbone(char *name) +static EditBone *get_named_editbone(char *name) { EditBone *eBone; @@ -2018,7 +2028,7 @@ EditBone *get_named_editbone(char *name) return NULL; } -void update_dup_subtarget(EditBone *dupBone) +static void update_dup_subtarget(EditBone *dupBone) { /* If an edit bone has been duplicated, lets * update it's constraints if the subtarget @@ -2588,7 +2598,7 @@ int ik_chain_looper(Object *ob, Bone *bone, void *data, return count; } -int bone_skinnable(Object *ob, Bone *bone, void *data) +static int bone_skinnable(Object *ob, Bone *bone, void *data) { /* Bones that are not of boneclass BONE_UNSKINNABLE * are regarded to be "skinnable" and are eligible for @@ -2625,7 +2635,7 @@ int bone_skinnable(Object *ob, Bone *bone, void *data) return 0; } -int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data) { +static int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data) { /* This group creates a vertex group to ob that has the * same name as bone (provided the bone is skinnable). * If such a vertex group aleady exist the routine exits. @@ -2639,7 +2649,7 @@ int add_defgroup_unique_bone(Object *ob, Bone *bone, void *data) { return 0; } -int dgroup_skinnable(Object *ob, Bone *bone, void *data) { +static int dgroup_skinnable(Object *ob, Bone *bone, void *data) { /* Bones that are not of boneclass BONE_UNSKINNABLE * are regarded to be "skinnable" and are eligible for * auto-skinning. @@ -2680,7 +2690,7 @@ int dgroup_skinnable(Object *ob, Bone *bone, void *data) { return 0; } -void add_verts_to_closest_dgroup(Object *ob, Object *par) +static void add_verts_to_closest_dgroup(Object *ob, Object *par) { /* This function implements a crude form of * auto-skinning: vertices are assigned to the @@ -2886,7 +2896,7 @@ void create_vgroups_from_armature(Object *ob, Object *par) } } -int hide_selected_pose_bone(Object *ob, Bone *bone, void *ptr) { +static int hide_selected_pose_bone(Object *ob, Bone *bone, void *ptr) { if (bone->flag & BONE_SELECTED) { bone->flag |= BONE_HIDDEN; bone->flag &= ~BONE_SELECTED; @@ -2908,7 +2918,7 @@ void hide_selected_pose_bones(void) { force_draw(1); } -int hide_unselected_pose_bone(Object *ob, Bone *bone, void *ptr) { +static int hide_unselected_pose_bone(Object *ob, Bone *bone, void *ptr) { if (~bone->flag & BONE_SELECTED) { bone->flag |= BONE_HIDDEN; } @@ -2929,7 +2939,7 @@ void hide_unselected_pose_bones(void) { force_draw(1); } -int show_pose_bone(Object *ob, Bone *bone, void *ptr) { +static int show_pose_bone(Object *ob, Bone *bone, void *ptr) { if (bone->flag & BONE_HIDDEN) { bone->flag &= ~BONE_HIDDEN; bone->flag |= BONE_SELECTED; diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c index 5ac3681743c..61761ad544a 100644 --- a/source/blender/src/editdeform.c +++ b/source/blender/src/editdeform.c @@ -59,6 +59,11 @@ #include <config.h> #endif +/* ----------------- function prototypes ---------------- */ +void remove_vert_def_nr (Object *, int , int ); +void add_vert_defnr (Object *, int , int vertnum, float , int ); + + void sel_verts_defgroup (int select) { EditMesh *em = G.editMesh; diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index efd5c30729e..ab17187df38 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -1154,7 +1154,7 @@ void set_faceselect() /* toggle */ * @param org origin of the view ray. * @param dir direction of the view ray. */ -void get_pick_ray(short x, short y, float org[3], float dir[3]) +static void get_pick_ray(short x, short y, float org[3], float dir[3]) { double mvmatrix[16]; double projmatrix[16]; @@ -1190,7 +1190,7 @@ void get_pick_ray(short x, short y, float org[3], float dir[3]) } -int triangle_ray_intersect(float tv0[3], float tv1[3], float tv2[3], float org[3], float dir[3], float uv[2]) +static int triangle_ray_intersect(float tv0[3], float tv1[3], float tv2[3], float org[3], float dir[3], float uv[2]) { float v1v0[3]; float v2v0[3]; @@ -1283,7 +1283,7 @@ int triangle_ray_intersect(float tv0[3], float tv1[3], float tv2[3], float org[3 * @param v4 vertex 4 coordinates. * @return number of vertices of this face */ -int face_get_vertex_coordinates(Mesh* mesh, TFace* face, float v1[3], float v2[3], float v3[3], float v4[3]) +static int face_get_vertex_coordinates(Mesh* mesh, TFace* face, float v1[3], float v2[3], float v3[3], float v4[3]) { int num_vertices; MVert *mv; @@ -1316,7 +1316,7 @@ int face_get_vertex_coordinates(Mesh* mesh, TFace* face, float v1[3], float v2[3 * @param u (u,v) coordinate. * @param v (u,v) coordinate. */ -void face_get_uv(TFace* face, int v1, int v2, int v3, float a, float b, float* u, float* v) +static void face_get_uv(TFace* face, int v1, int v2, int v3, float a, float b, float* u, float* v) { float uv01[2], uv21[2]; @@ -1359,7 +1359,7 @@ void face_get_uv(TFace* face, int v1, int v2, int v3, float a, float b, float* u * 0 == no intersection, (u,v) invalid * 1 == intersection, (u,v) valid */ -int face_pick_uv(Object* object, Mesh* mesh, TFace* face, short x, short y, float* u, float* v) +static int face_pick_uv(Object* object, Mesh* mesh, TFace* face, short x, short y, float* u, float* v) { float org[3], dir[3]; float ab[2]; diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c index 0a058c9c902..ee71ff37d9a 100644 --- a/source/blender/src/editfont.c +++ b/source/blender/src/editfont.c @@ -78,6 +78,9 @@ #define MAXTEXT 1000 +/* -- prototypes --------*/ +VFont *get_builtin_font(void); + int textediting=0; static char findaccent(char char1, char code) diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index 3fc97bb5d23..800e5418f48 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -77,6 +77,8 @@ /* GLOBALS */ extern char *fsmenu; +void winqreadimaselspace(ScrArea *, void *, BWinEvent *); + void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt) { unsigned short event= evt->event; diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 6aac31360f2..574df40c6bb 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -2630,7 +2630,7 @@ void mouse_select_ipo() } } -int icu_keys_bezier_loop(IpoCurve *icu, +static int icu_keys_bezier_loop(IpoCurve *icu, int (*bezier_function)(BezTriple *), void (ipocurve_function)(struct IpoCurve *icu)) { @@ -2673,7 +2673,7 @@ int icu_keys_bezier_loop(IpoCurve *icu, } -int ipo_keys_bezier_loop(Ipo *ipo, +static int ipo_keys_bezier_loop(Ipo *ipo, int (*bezier_function)(BezTriple *), void (ipocurve_function)(struct IpoCurve *icu)) { @@ -2696,7 +2696,7 @@ int ipo_keys_bezier_loop(Ipo *ipo, return 0; } -int selected_bezier_loop(int (*looptest)(EditIpo *), +static int selected_bezier_loop(int (*looptest)(EditIpo *), int (*bezier_function)(BezTriple *), void (ipocurve_function)(struct IpoCurve *icu)) { @@ -2788,7 +2788,7 @@ int select_bezier_invert(BezTriple *bezt) { return 0; } -int set_bezier_auto(BezTriple *bezt) +static int set_bezier_auto(BezTriple *bezt) { /* Sets the selected bezier handles to type 'auto' */ @@ -2811,7 +2811,7 @@ int set_bezier_auto(BezTriple *bezt) return 0; } -int set_bezier_vector(BezTriple *bezt) +static int set_bezier_vector(BezTriple *bezt) { /* Sets the selected bezier handles to type 'vector' */ @@ -2834,7 +2834,7 @@ int set_bezier_vector(BezTriple *bezt) return 0; } -int bezier_isfree(BezTriple *bezt) +static int bezier_isfree(BezTriple *bezt) { /* queries whether the handle should be set * to type 'free' (I think) @@ -2844,7 +2844,7 @@ int bezier_isfree(BezTriple *bezt) return 0; } -int set_bezier_free(BezTriple *bezt) +static int set_bezier_free(BezTriple *bezt) { /* Sets selected bezier handles to type 'free' */ @@ -2853,7 +2853,7 @@ int set_bezier_free(BezTriple *bezt) return 0; } -int set_bezier_align(BezTriple *bezt) +static int set_bezier_align(BezTriple *bezt) { /* Sets selected bezier handles to type 'align' */ @@ -2862,7 +2862,7 @@ int set_bezier_align(BezTriple *bezt) return 0; } -int vis_edit_icu_bez(EditIpo *ei) { +static int vis_edit_icu_bez(EditIpo *ei) { /* A 4 part test for an EditIpo : * is it a) visible * b) in edit mode @@ -2976,19 +2976,19 @@ void sethandles_ipo(int code) } -void set_ipocurve_constant(struct IpoCurve *icu) { +static void set_ipocurve_constant(struct IpoCurve *icu) { /* Sets the type of the IPO curve to constant */ icu->ipo= IPO_CONST; } -void set_ipocurve_linear(struct IpoCurve *icu) { +static void set_ipocurve_linear(struct IpoCurve *icu) { /* Sets the type of the IPO curve to linear */ icu->ipo= IPO_LIN; } -void set_ipocurve_bezier(struct IpoCurve *icu) { +static void set_ipocurve_bezier(struct IpoCurve *icu) { /* Sets the type of the IPO curve to bezier */ icu->ipo= IPO_BEZ; diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c index 03e1496c25c..d2cdb1cf8e3 100644 --- a/source/blender/src/editkey.c +++ b/source/blender/src/editkey.c @@ -89,6 +89,10 @@ extern ListBase editNurb; /* in editcurve.c */ + +/* local prototypes ------------------ */ +void make_rvk_slider(uiBlock *, Key *, int , int , int , int , int ); /* used in drawaction.c too */ + /* temporary storage for slider values */ float meshslidervals[64] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c index 11370232e3d..6c96baada5a 100644 --- a/source/blender/src/editmesh_lib.c +++ b/source/blender/src/editmesh_lib.c @@ -178,7 +178,8 @@ int EM_nfaces_selected(void) return count; } -int EM_nedges(void) +#if 0 +static int EM_nedges(void) { EditMesh *em = G.editMesh; EditEdge *eed; @@ -187,6 +188,7 @@ int EM_nedges(void) for (eed= em->edges.first; eed; eed= eed->next) count++; return count; } +#endif int EM_nvertices_selected(void) { diff --git a/source/blender/src/editmesh_loop.c b/source/blender/src/editmesh_loop.c index e5961981ff6..48a92f7d7ed 100644 --- a/source/blender/src/editmesh_loop.c +++ b/source/blender/src/editmesh_loop.c @@ -94,7 +94,7 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv /* *************** LOOP SELECT ************* */ -short edgeFaces(EditEdge *e){ +static short edgeFaces(EditEdge *e){ EditMesh *em = G.editMesh; EditFace *search=NULL; short count = 0; @@ -112,7 +112,7 @@ short edgeFaces(EditEdge *e){ returns 1 if they do returns 0 if they do not, or if the function is passed the same edge 2 times */ -short sharesFace(EditEdge* e1, EditEdge* e2) +static short sharesFace(EditEdge* e1, EditEdge* e2) { EditMesh *em = G.editMesh; EditFace *search=NULL; @@ -400,7 +400,7 @@ typedef struct CutCurve { short y; } CutCurve; -CutCurve *get_mouse_trail(int *len, char mode){ +static CutCurve *get_mouse_trail(int *len, char mode){ CutCurve *curve,*temp; short event, val, ldown=0, restart=0, rubberband=0; diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 9d1c3cb84e6..7ac3fc7a03e 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -431,7 +431,7 @@ static EditVert *findnearestvert_f(short *dist, short sel) } /* backbuffer version */ -EditVert *findnearestvert(short *dist, short sel) +static EditVert *findnearestvert(short *dist, short sel) { if(G.vd->drawtype>OB_WIRE && (G.vd->flag & V3D_ZBUF_SELECT)) { EditVert *eve=NULL; diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 5003f16d599..1a4d7b64d9c 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -93,6 +93,10 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "editmesh.h" +/* local prototypes ---------------*/ +void bevel_menu(void); + + /********* qsort routines *********/ @@ -2836,7 +2840,7 @@ void edge_rotate_selected(int dir) /******************* BEVEL CODE STARTS HERE ********************/ -void bevel_displace_vec(float *midvec, float *v1, float *v2, float *v3, float d, float no[3]) +static void bevel_displace_vec(float *midvec, float *v1, float *v2, float *v3, float d, float no[3]) { float a[3], c[3], n_a[3], n_c[3], mid[3], ac, ac2, fac; @@ -2869,7 +2873,7 @@ void bevel_displace_vec(float *midvec, float *v1, float *v2, float *v3, float d, Lots of sqrts which would not be good for a real time algo Using the mid point of the extrapolation of both sides Useless for coplanar quads, but that doesn't happen too often */ -void fix_bevel_wrap(float *midvec, float *v1, float *v2, float *v3, float *v4, float d, float no[3]) +static void fix_bevel_wrap(float *midvec, float *v1, float *v2, float *v3, float *v4, float d, float no[3]) { float a[3], b[3], c[3], l_a, l_b, l_c, s_a, s_b, s_c, Pos1[3], Pos2[3], Dir[3]; @@ -2905,7 +2909,7 @@ void fix_bevel_wrap(float *midvec, float *v1, float *v2, float *v3, float *v4, f } -char detect_wrap(float *o_v1, float *o_v2, float *v1, float *v2, float *no) +static char detect_wrap(float *o_v1, float *o_v2, float *v1, float *v2, float *no) { float o_a[3], a[3], o_c[3], c[3]; @@ -2923,7 +2927,7 @@ char detect_wrap(float *o_v1, float *o_v2, float *v1, float *v2, float *no) // Detects and fix a quad wrapping after the resize // Arguments are the orginal verts followed by the final verts and then the bevel size and the normal -void fix_bevel_quad_wrap(float *o_v1, float *o_v2, float *o_v3, float *o_v4, float *v1, float *v2, float *v3, float *v4, float d, float *no) +static void fix_bevel_quad_wrap(float *o_v1, float *o_v2, float *o_v3, float *o_v4, float *v1, float *v2, float *v3, float *v4, float d, float *no) { float vec[3]; char wrap[4]; @@ -2997,7 +3001,7 @@ void fix_bevel_quad_wrap(float *o_v1, float *o_v2, float *o_v3, float *o_v4, flo // Detects and fix a tri wrapping after the resize // Arguments are the orginal verts followed by the final verts and the normal // Triangles cannot wrap partially (not in this situation -void fix_bevel_tri_wrap(float *o_v1, float *o_v2, float *o_v3, float *v1, float *v2, float *v3, float *no) +static void fix_bevel_tri_wrap(float *o_v1, float *o_v2, float *o_v3, float *v1, float *v2, float *v3, float *no) { if (detect_wrap(o_v1, o_v2, v1, v2, no)) { float vec[3]; @@ -3010,7 +3014,7 @@ void fix_bevel_tri_wrap(float *o_v1, float *o_v2, float *o_v3, float *v1, float } } -void bevel_shrink_faces(float d, int flag) +static void bevel_shrink_faces(float d, int flag) { EditMesh *em = G.editMesh; EditFace *efa; @@ -3051,7 +3055,7 @@ void bevel_shrink_faces(float d, int flag) } } -void bevel_shrink_draw(float d, int flag) +static void bevel_shrink_draw(float d, int flag) { EditMesh *em = G.editMesh; EditFace *efa; @@ -3120,7 +3124,7 @@ void bevel_shrink_draw(float d, int flag) } } -void bevel_mesh(float bsize, int allfaces) +static void bevel_mesh(float bsize, int allfaces) { EditMesh *em = G.editMesh; //#define BEV_DEBUG @@ -3526,7 +3530,7 @@ void bevel_mesh(float bsize, int allfaces) #undef BEV_DEBUG } -void bevel_mesh_recurs(float bsize, short recurs, int allfaces) +static void bevel_mesh_recurs(float bsize, short recurs, int allfaces) { float d; short nr; diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c index 89737c9aff3..615cce62511 100644 --- a/source/blender/src/editmode_undo.c +++ b/source/blender/src/editmode_undo.c @@ -94,6 +94,15 @@ void undo_editmode_menu(void) // history menu */ /* ********************************************************************* */ +/* local prototypes --------------- */ + void undo_editmode_step(int step); // undo and redo + void undo_editmode_clear(void); // free & clear all data + void undo_editmode_menu(void); // history menu + void undo_editmode_push(char *name, void (*freedata)(void *), + void (*to_editmode)(void *), void *(*from_editmode)(void)); + struct uiBlock *editmode_undohistorymenu(void *arg_unused); + + #define MAXUNDONAME 64 typedef struct UndoElem { diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 1e41e5f9683..1d2267db4fb 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -144,6 +144,7 @@ #include "BSE_editipo.h" #include "BSE_filesel.h" /* For activate_databrowse() */ #include "BSE_view.h" +#include "BSE_drawview.h" #include "BSE_trans_types.h" #include "BSE_editipo_types.h" @@ -189,6 +190,13 @@ float centre[3], centroid[3]; void mirrormenu(void); +/* local prototypes -------------*/ +int pose_flags_reset_done(Object *); /* used in transform_generic.c */ +void figure_bone_nocalc(Object *); /* used in transform.c */ +void figure_pose_updating(void); /* used in transform.c */ +void constline_callback(void); /* used in drawview.c */ +/* --------------------------------- */ + void add_object_draw(int type) /* for toolbox or menus, only non-editmode stuff */ { Object *ob; @@ -292,7 +300,7 @@ void delete_obj(int ok) BIF_undo_push("Delete object(s)"); } -int return_editmesh_indexar(int **indexar, float *cent) +static int return_editmesh_indexar(int **indexar, float *cent) { EditMesh *em = G.editMesh; EditVert *eve; @@ -335,7 +343,7 @@ static void select_editmesh_hook(ObHook *hook) EM_select_flush(); } -int return_editlattice_indexar(int **indexar, float *cent) +static int return_editlattice_indexar(int **indexar, float *cent) { BPoint *bp; int *index, nr, totvert=0, a; @@ -392,7 +400,7 @@ static void select_editlattice_hook(ObHook *hook) } } -int return_editcurve_indexar(int **indexar, float *cent) +static int return_editcurve_indexar(int **indexar, float *cent) { extern ListBase editNurb; Nurb *nu; @@ -3142,7 +3150,7 @@ static int is_ob_constraint_target(Object *ob, ListBase *conlist) { } -int clear_bone_nocalc(Object *ob, Bone *bone, void *ptr) { +static int clear_bone_nocalc(Object *ob, Bone *bone, void *ptr) { /* When we aren't transform()-ing, we'll want to turn off * the no calc flag for bone bone in case the frame changes, * or something @@ -3165,7 +3173,7 @@ static void clear_bone_nocalc_ob(Object *ob) { } -int set_bone_nocalc(Object *ob, Bone *bone, void *ptr) { +static int set_bone_nocalc(Object *ob, Bone *bone, void *ptr) { /* Calculating bone transformation makes thins slow ... * lets set the no calc flag for a bone by default */ @@ -3174,7 +3182,7 @@ int set_bone_nocalc(Object *ob, Bone *bone, void *ptr) { return 0; } -int selected_bone_docalc(Object *ob, Bone *bone, void *ptr) { +static int selected_bone_docalc(Object *ob, Bone *bone, void *ptr) { /* Let's clear the no calc flag for selected bones. * This function always returns 1 for non-no calc bones * (a.k.a., the 'do calc' bones) so that the bone_looper @@ -3346,7 +3354,7 @@ void figure_bone_nocalc(Object *ob) { figure_bone_nocalc_core(ob, arm); } -int bone_nocalc2chan_trans_update(Object *ob, Bone *bone, void *ptr) { +static int bone_nocalc2chan_trans_update(Object *ob, Bone *bone, void *ptr) { /* Set PCHAN_TRANS_UPDATE for channels with bones that don't have * the no calc flag set ... I hate this. */ @@ -3364,7 +3372,7 @@ int bone_nocalc2chan_trans_update(Object *ob, Bone *bone, void *ptr) { return 0; } -void clear_gonna_move(void) { +static void clear_gonna_move(void) { Base *base; /* clear the gonna move flag */ @@ -3373,7 +3381,7 @@ void clear_gonna_move(void) { } } -int is_parent_gonna_move(Object *ob) { +static int is_parent_gonna_move(Object *ob) { if ( (ob->parent) && (ob->parent->flag & OB_GONNA_MOVE) ) { return 1; @@ -3381,7 +3389,7 @@ int is_parent_gonna_move(Object *ob) { return 0; } -int is_constraint_target_gonna_move(Object *ob) { +static int is_constraint_target_gonna_move(Object *ob) { Object *tarOb; bConstraint *con; bPoseChannel *chan; @@ -3407,7 +3415,7 @@ int is_constraint_target_gonna_move(Object *ob) { return 0; } -void flag_moving_objects(void) { +static void flag_moving_objects(void) { Base *base; int numgonnamove = 0, oldnumgonnamove = -1; @@ -4862,7 +4870,8 @@ static void view_editmove(unsigned char event) static void constline(float *center, float *dir, char axis, float axismat[][3]) { - extern void make_axis_color(char *col, char *col2, char axis); // drawview.c +/* extern void make_axis_color(char *col, char *col2, char axis); // drawview.c +*/ float v1[3], v2[3], v3[3]; char col[3], col2[3]; diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 3725024440c..5c311b594ce 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -128,6 +128,12 @@ static ScrArea *g_activearea= NULL; short winqueue_break= 0; ScrArea *curarea= 0; +/* prototypes -------------------*/ +int afterqtest(short win, unsigned short evt); +unsigned short screen_qread(short *val, char *ascii); +void add_to_mainqueue(Window *win, void *user_data, short evt, short val, char ascii); +static void drawscredge_area(ScrArea *sa); + /**********************************************************************/ static void screen_set_cursor(bScreen *sc) @@ -738,7 +744,7 @@ static void screen_edge_edit_event(ScrArea *actarea, ScrEdge *actedge, short evt /***/ -void mywindow_init_mainwin(Window *win, int orx, int ory, int sizex, int sizey); +extern void mywindow_init_mainwin(Window *win, int orx, int ory, int sizex, int sizey); void test_scale_screen(bScreen *); static void resize_screens(int x, int y, int w, int h) { diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 9c3b8f30033..971e0395aa7 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -92,6 +92,12 @@ struct uvvertsort { TFace *tface; }; +/* local prototypes */ +void clever_numbuts_sima(void); +void sel_uvco_inside_radius(short , TFace *, int , float *, float *, short); +void uvedit_selectionCB(short , Object *, short *, float ); /* used in edit.c*/ + + static int compuvvert(const void *u1, const void *u2) { const struct uvvertsort *v1=u1, *v2=u2; diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c index fc2ff3c3fb4..5eec31adb12 100644 --- a/source/blender/src/editsound.c +++ b/source/blender/src/editsound.c @@ -452,7 +452,7 @@ void sound_read_wav_data(bSound* sound, PackedFile* pf) /* ugly, but it works (for now) */ -int sound_get_filetype_from_header(bSound* sound, PackedFile* pf) +static int sound_get_filetype_from_header(bSound* sound, PackedFile* pf) { int filetype = SAMPLE_INVALID; int i; @@ -534,7 +534,7 @@ int sound_get_filetype_from_header(bSound* sound, PackedFile* pf) -int check_filetype(bSound* sound, PackedFile* pf) +static int check_filetype(bSound* sound, PackedFile* pf) { // char* pdest; sound->sample->type = SAMPLE_INVALID; diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index cbbe43a2f32..c717c695d52 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -105,7 +105,8 @@ extern ListBase editNurb; /* originally from exports.h, memory from editcurve.c* /* editmball.c */ extern ListBase editelems; - +/* local prototypes */ +void obedit_selectionCB(short , Object *, short *, float ); /* called in edit.c */ void arrows_move_cursor(unsigned short event) { @@ -835,7 +836,7 @@ void selectall_type(short obtype) BIF_undo_push("Select all per type"); } /* selects all objects on a particular layer */ -void selectall_layer(int layernum) +void selectall_layer(unsigned int layernum) { Base *base; @@ -1534,7 +1535,7 @@ void borderselect(void) XXX These callback functions are still dirty, because they call globals... */ -void mesh_selectionCB(int selecting, Object *editobj, short *mval, float rad) +static void mesh_selectionCB(int selecting, Object *editobj, short *mval, float rad) { extern int em_solidoffs, em_wireoffs; // let linker solve it... from editmesh_mods.c EditMesh *em = G.editMesh; @@ -1615,7 +1616,7 @@ void mesh_selectionCB(int selecting, Object *editobj, short *mval, float rad) } -void nurbscurve_selectionCB(int selecting, Object *editobj, short *mval, float rad) +static void nurbscurve_selectionCB(int selecting, Object *editobj, short *mval, float rad) { Nurb *nu; BPoint *bp; @@ -1681,7 +1682,7 @@ void nurbscurve_selectionCB(int selecting, Object *editobj, short *mval, float r } -void lattice_selectionCB(int selecting, Object *editobj, short *mval, float rad) +static void lattice_selectionCB(int selecting, Object *editobj, short *mval, float rad) { BPoint *bp; float x, y, r; diff --git a/source/blender/src/eventdebug.c b/source/blender/src/eventdebug.c index a4aeabcd406..6c6a137a789 100644 --- a/source/blender/src/eventdebug.c +++ b/source/blender/src/eventdebug.c @@ -36,6 +36,8 @@ #include <config.h> #endif +char *event_to_string(short); + char *event_to_string(short evt) { #define smap(evt) case evt: return #evt switch (evt) { diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index c673fb934bb..5f145b71a47 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -104,6 +104,7 @@ #include "blendef.h" #include "nla.h" +#include "BIF_fsmenu.h" /* include ourselves */ #if defined WIN32 || defined __BeOS int fnmatch(){return 0;} @@ -134,6 +135,8 @@ static void filesel_select_objects(struct SpaceFile *sfile); static void active_file_object(struct SpaceFile *sfile); static int groupname_to_code(char *group); +extern void countall(void); + /* local globals */ static rcti scrollrct, textrct, bar; diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index f08085afa06..5effb1fc461 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -69,7 +69,9 @@ #include <Carbon/Carbon.h> /*declarations*/ -int checkAppleVideoCard(); +int checkAppleVideoCard(void); +void getMacAvailableBounds(short *, short *, short *, short *); + #endif /// @@ -114,7 +116,7 @@ struct _Window { static int macPrefState = 0; -int checkAppleVideoCard() { +int checkAppleVideoCard(void) { long theErr; unsigned long display_mask; CGLRendererInfoObj rend; diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 80f8ea4121f..ae05ec4c263 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -88,7 +88,7 @@ #include "TPT_DependKludge.h" -void load_space_image(char *str) /* called from fileselect */ +static void load_space_image(char *str) /* called from fileselect */ { Image *ima=0; @@ -111,7 +111,7 @@ void load_space_image(char *str) /* called from fileselect */ allqueue(REDRAWIMAGE, 0); } -void image_replace(Image *old, Image *new) +static void image_replace(Image *old, Image *new) { TFace *tface; Mesh *me; @@ -146,7 +146,7 @@ void image_replace(Image *old, Image *new) else error("Nothing replaced"); } -void replace_space_image(char *str) /* called from fileselect */ +static void replace_space_image(char *str) /* called from fileselect */ { Image *ima=0; @@ -174,7 +174,7 @@ void replace_space_image(char *str) /* called from fileselect */ allqueue(REDRAWIMAGE, 0); } -void save_paint(char *name) +static void save_paint(char *name) { char str[FILE_MAXDIR+FILE_MAXFILE]; Image *ima = G.sima->image; diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 6c98fa0b5be..d21dc8a1bff 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -524,7 +524,7 @@ static void check_packAll() } } -int write_runtime(char *str, char *exename) +static int write_runtime(char *str, char *exename) { char *freestr= NULL; char *ext = 0; @@ -578,14 +578,18 @@ static void write_runtime_check(char *str) /************************** MAIN MENU *****************************/ /************************** FILE *****************************/ -void do_info_file_optionsmenu(void *arg, int event) +#if 0 +static void do_info_file_optionsmenu(void *arg, int event) { G.fileflags ^= (1 << event); // allqueue(REDRAWINFO, 0); } +#endif #if GAMEBLENDER == 1 + +#if 0 static uiBlock *info_file_optionsmenu(void *arg_unused) { uiBlock *block; @@ -662,6 +666,8 @@ static uiBlock *info_runtime_optionsmenu(void *arg_unused) } #endif +#endif + static void do_info_file_importmenu(void *arg, int event) { ScrArea *sa; diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 462c1208da7..8e255092518 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -534,7 +534,7 @@ static uiBlock *view3d_select_object_typemenu(void *arg_unused) void do_view3d_select_object_layermenu(void *arg, int event) { - extern void selectall_layer(int layernum); + extern void selectall_layer(unsigned int layernum); switch(event) { case 0: @@ -1268,7 +1268,7 @@ static uiBlock *view3d_transform_scaleaxismenu(void *arg_unused) return block; } -void do_view3d_transformmenu(void *arg, int event) +static void do_view3d_transformmenu(void *arg, int event) { switch(event) { case 1: @@ -2528,7 +2528,7 @@ static uiBlock *view3d_edit_curvemenu(void *arg_unused) return block; } -void do_view3d_edit_mball_showhidemenu(void *arg, int event) +static void do_view3d_edit_mball_showhidemenu(void *arg, int event) { switch(event) { case 10: /* show hidden control points */ @@ -3422,7 +3422,7 @@ static char *around_pup(void) return (string); } -char *propfalloff_pup(void) +static char *propfalloff_pup(void) { static char string[512]; diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 5a38b29f250..510619e0a8a 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -491,7 +491,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco, return xco; } -void do_update_for_newframe(int mute) +static void do_update_for_newframe(int mute) { extern void audiostream_scrub(unsigned int frame); /* seqaudio.c */ @@ -559,7 +559,7 @@ static void show_splash(void) /* Functions for user preferences fileselect windows */ /* yafray: export dir select */ -void filesel_u_yfexportdir(char *name) +static void filesel_u_yfexportdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -568,7 +568,7 @@ void filesel_u_yfexportdir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_fontdir(char *name) +static void filesel_u_fontdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -577,7 +577,7 @@ void filesel_u_fontdir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_textudir(char *name) +static void filesel_u_textudir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -586,7 +586,7 @@ void filesel_u_textudir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_plugtexdir(char *name) +static void filesel_u_plugtexdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -595,7 +595,7 @@ void filesel_u_plugtexdir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_plugseqdir(char *name) +static void filesel_u_plugseqdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -604,7 +604,7 @@ void filesel_u_plugseqdir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_renderdir(char *name) +static void filesel_u_renderdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -613,7 +613,7 @@ void filesel_u_renderdir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_pythondir(char *name) +static void filesel_u_pythondir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -622,7 +622,7 @@ void filesel_u_pythondir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_sounddir(char *name) +static void filesel_u_sounddir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); @@ -631,7 +631,7 @@ void filesel_u_sounddir(char *name) allqueue(REDRAWALL, 0); } -void filesel_u_tempdir(char *name) +static void filesel_u_tempdir(char *name) { char dir[FILE_MAXDIR], file[FILE_MAXFILE]; BLI_split_dirfile(name, dir, file); diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index df60ea61a38..6c650489016 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -3994,8 +3994,9 @@ uiBlock *uiGetBlock(char *name, ScrArea *sa) return NULL; } +#if 0 /* used for making screenshots for menus, called in screendump.c */ -int uiIsMenu(int *x, int *y, int *sizex, int *sizey) +static int uiIsMenu(int *x, int *y, int *sizex, int *sizey) { uiBlock *block= curarea->uiblocks.first; int minx, miny, maxx, maxy; @@ -4025,6 +4026,7 @@ printf("%d %d %d %d\n", minx, miny, maxx, maxy); return 0; } +#endif void ui_check_but(uiBut *but) { @@ -4382,7 +4384,8 @@ void uiBlockEndAlign(uiBlock *block) block->flag &= ~UI_BUT_ALIGN; // all 4 flags } -void uiBlockEndAligno(uiBlock *block) +#if 0 +static void uiBlockEndAligno(uiBlock *block) { uiBut *but; @@ -4401,6 +4404,7 @@ void uiBlockEndAligno(uiBlock *block) } block->flag &= ~UI_BUT_ALIGN; // all 4 flags } +#endif static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip) { diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index f420a903de0..f3afdb6e44f 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -91,6 +91,10 @@ // globals extern float UIwinmat[4][4]; +// local prototypes +void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, float maxy); + + /* ************** safe rasterpos for pixmap alignment with pixels ************* */ void ui_rasterpos_safe(float x, float y, float aspect) @@ -147,7 +151,7 @@ void uiEmboss(float x1, float y1, float x2, float y2, int sel) static void ui_draw_icon(uiBut *but, BIFIconID icon) { - void BIF_icon_pos(float xs, float ys); + // void BIF_icon_pos(float xs, float ys); int blend= 0; float xs=0, ys=0; diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c index 3c9a61af0e7..78bffb222b7 100644 --- a/source/blender/src/interface_panel.c +++ b/source/blender/src/interface_panel.c @@ -1517,7 +1517,7 @@ static void test_add_new_tabs(ScrArea *sa) /* ------------ panel drag ---------------- */ -void ui_drag_panel(uiBlock *block) +static void ui_drag_panel(uiBlock *block) { Panel *panel= block->panel; short align=0, first=1, ofsx, ofsy, dx=0, dy=0, dxo=0, dyo=0, mval[2], mvalo[2]; diff --git a/source/blender/src/language.c b/source/blender/src/language.c index 564f10fd20b..8e059da799b 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -195,7 +195,7 @@ char *language_pup(void) } -LANGMenuEntry *find_language(short langid) +static LANGMenuEntry *find_language(short langid) { LANGMenuEntry *lme = langmenu; @@ -276,7 +276,7 @@ void start_interface_font(void) } -char *first_dpointchar(char *string) +static char *first_dpointchar(char *string) { char *dpointchar; @@ -286,7 +286,7 @@ char *first_dpointchar(char *string) } -void splitlangline(char *line, LANGMenuEntry *lme) +static void splitlangline(char *line, LANGMenuEntry *lme) { char *dpointchar= first_dpointchar(line); @@ -300,7 +300,7 @@ void splitlangline(char *line, LANGMenuEntry *lme) } -void puplang_insert_entry(char *line) +static void puplang_insert_entry(char *line) { LANGMenuEntry *lme, *prev; int sorted = 0; diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 6279dba6c89..70f806adb8d 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -90,6 +90,9 @@ void sort_faces(void); #include "mydevice.h" #include "blendef.h" +#include "BIF_meshtools.h" /* include ourself for prototypes */ + + /* * ********************** no editmode!!! *********** */ diff --git a/source/blender/src/mywindow.c b/source/blender/src/mywindow.c index b7d904af727..2da9dff1375 100644 --- a/source/blender/src/mywindow.c +++ b/source/blender/src/mywindow.c @@ -81,6 +81,10 @@ static bWindow *swinarray[MAXWIN]= {0}; static bWindow mainwindow, renderwindow; static int mainwin_color_depth; +/* prototypes --------------- */ +void mywindow_init_mainwin(Window *, int , int , int , int ); +void mywindow_build_and_set_renderwin( int , int , int , int); + void mywindow_init_mainwin(Window *win, int orx, int ory, int sizex, int sizey) { GLint r, g, b; diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index d2a2fd94428..1f460efc8ea 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -2186,7 +2186,7 @@ static void namebutton_cb(void *voidp, void *arg2_unused) } } -void outliner_buttons(uiBlock *block, SpaceOops *soops, ListBase *lb) +static void outliner_buttons(uiBlock *block, SpaceOops *soops, ListBase *lb) { uiBut *bt; TreeElement *te; diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index d2f4f9abcae..87d79a46cc0 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -85,6 +85,8 @@ #include "BIF_interface.h" #include "BIF_glutil.h" +#include "BIF_previewrender.h" /* include ourself for prototypes */ + #include "PIL_time.h" #include "RE_renderconverter.h" diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 58a3bfba3de..c06d4384514 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1118,6 +1118,8 @@ static void scalefastrect(unsigned int *recto, unsigned int *rectn, int oldx, in /* -------------- API: externally called --------------- */ +/* not used anywhere ??? */ +#if 0 void BIF_renderwin_make_active(void) { if(render_win) { @@ -1125,6 +1127,7 @@ void BIF_renderwin_make_active(void) mywinset(2); } } +#endif /* set up display, render an image or scene */ void BIF_do_render(int anim) diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index ead7577b0d0..b1db1f755f6 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -98,6 +98,7 @@ static Icon *icon_from_data(unsigned char *rect, GLuint texid, int xofs, int yof return icon; } +#if 0 static float icon_x=0.0, icon_y=0.0; void BIF_icon_pos(float xs, float ys) { @@ -142,6 +143,7 @@ static void icon_draw_tex(Icon *icon) glEnd(); glDisable(GL_TEXTURE_2D); } +#endif static void icon_draw(Icon *icon) diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c index 6f7eede12e2..6e645a8867f 100644 --- a/source/blender/src/seqaudio.c +++ b/source/blender/src/seqaudio.c @@ -79,6 +79,7 @@ #include "BSE_view.h" #include "BSE_seqaudio.h" +#include "BIF_editsound.h" #include "mydevice.h" #include "blendef.h" @@ -94,9 +95,10 @@ int audio_scrub=0; int audio_playing=0; ///// // +/* local protos ------------------- */ +void audio_mixdown(void); - -void makewavstring (char *string) +static void makewavstring (char *string) { char txt[64]; @@ -199,7 +201,7 @@ void audio_mixdown() return; } -void audio_levels(Uint8 *buf, int len, float db, float facf, float pan) +static void audio_levels(Uint8 *buf, int len, float db, float facf, float pan) { int i; float facl, facr, fac; @@ -311,7 +313,7 @@ void audio_fill(void *mixdown, Uint8 *sstream, int len) } } -int audio_init(SDL_AudioSpec *desired) +static int audio_init(SDL_AudioSpec *desired) { SDL_AudioSpec *obtained, *hardware_spec; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 67fa0819240..95232d15c3d 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -530,7 +530,7 @@ static void align_view_to_selected(View3D *v3d) } } -void select_children(Object *ob, int recursive) +static void select_children(Object *ob, int recursive) { Base *base; @@ -542,7 +542,7 @@ void select_children(Object *ob, int recursive) } } -void select_parent(void) /* Makes parent active and de-selected OBACT */ +static void select_parent(void) /* Makes parent active and de-selected OBACT */ { Base *base, *startbase, *basact=NULL, *oldbasact; @@ -2036,7 +2036,8 @@ void space_mipmap_button_function(int event) { allqueue(REDRAWVIEW3D, 0); } -void space_sound_button_function(int event) +#if 0 +static void space_sound_button_function(int event) { int a; SYS_SystemHandle syshandle; @@ -2047,6 +2048,7 @@ void space_sound_button_function(int event) SYS_WriteCommandLineInt(syshandle, "noaudio", a); } } +#endif #define B_ADD_THEME 3301 #define B_DEL_THEME 3302 @@ -2064,7 +2066,7 @@ static short th_curcol= TH_BACK; static char *th_curcol_ptr= NULL; static char th_curcol_arr[4]={0, 0, 0, 255}; -void info_user_themebuts(uiBlock *block, short y1, short y2, short y3) +static void info_user_themebuts(uiBlock *block, short y1, short y2, short y3) { bTheme *btheme, *bt; int spacetype= 0; @@ -3462,7 +3464,7 @@ static void init_actionspace(ScrArea *sa) } -void free_actionspace(SpaceAction *saction) +static void free_actionspace(SpaceAction *saction) { /* don't free saction itself */ diff --git a/source/blender/src/spacetypes.c b/source/blender/src/spacetypes.c index 1b1f87f6d1b..6c7b083f25f 100644 --- a/source/blender/src/spacetypes.c +++ b/source/blender/src/spacetypes.c @@ -59,6 +59,10 @@ struct _SpaceType { SpaceHandleFP winhandle; }; +/* local prototypes ----------------------- */ +void scrarea_do_windraw(ScrArea *area); +void scrarea_do_winchange(ScrArea *area); +void scrarea_do_winhandle(ScrArea *area, BWinEvent *evt); SpaceType *spacetype_new(char *name) { @@ -77,7 +81,7 @@ void spacetype_set_winfuncs(SpaceType *st, SpaceDrawFP draw, SpaceChangeFP chang /***/ -SpaceType *spacetype_from_code(int spacecode) +static SpaceType *spacetype_from_code(int spacecode) { switch (spacecode) { case SPACE_ACTION: return spaceaction_get_type(); diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index fd9a35df17a..9118a35e53b 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -112,7 +112,7 @@ void schrijfplaatje(char *name); -void write_imag(char *name) +static void write_imag(char *name) { /* from file select */ char str[256]; diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 8dd2804a2fa..f9af3e80973 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -121,6 +121,10 @@ static char *tbstr, *tbstr1, *keystr; static void (*tbfunc)(int); static int tbval; +/* prototypes ----------------------- */ +TBcallback *callback_dummy(int level, int entry); + + /* *********** PC PATCH ************* */ void ColorFunc(int i) diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index 4b91608deef..ecaf23daa52 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -196,7 +196,7 @@ static void set_prop_dist(TransInfo *t) /* ************************** CONVERSIONS ************************* */ -void createTransTexspace(void) +static void createTransTexspace(void) { TransData *td; Object *ob; diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c index 985bb431a13..0627183e72b 100755 --- a/source/blender/src/transform_constraints.c +++ b/source/blender/src/transform_constraints.c @@ -114,7 +114,7 @@ void recalcData(); /* ************************** CONSTRAINTS ************************* */ void getConstraintMatrix(TransInfo *t); -void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) { +static void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) { int i = 0; Mat3MulVecfl(t->con.imtx, vec); @@ -146,7 +146,7 @@ void postConstraintChecks(TransInfo *t, float vec[3], float pvec[3]) { Mat3MulVecfl(t->con.mtx, vec); } -void getViewVector(TransInfo *t, float coord[3], float vec[3]) { +static void getViewVector(TransInfo *t, float coord[3], float vec[3]) { if (G.vd->persp) { float p1[4], p2[4]; @@ -171,7 +171,7 @@ void getViewVector(TransInfo *t, float coord[3], float vec[3]) { } } -void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3]) { +static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3]) { float norm[3], n[3], vec[3], factor; getViewVector(t, in, norm); @@ -196,7 +196,7 @@ void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3]) { } } -void planeProjection(TransInfo *t, float in[3], float out[3]) { +static void planeProjection(TransInfo *t, float in[3], float out[3]) { float vec[3], factor, angle, norm[3]; getViewVector(t, in, norm); @@ -224,7 +224,7 @@ void planeProjection(TransInfo *t, float in[3], float out[3]) { * */ -void applyAxisConstraintVec(TransInfo *t, TransData *td, float in[3], float out[3], float pvec[3]) +static void applyAxisConstraintVec(TransInfo *t, TransData *td, float in[3], float out[3], float pvec[3]) { VECCOPY(out, in); if (!td && t->con.mode & CON_APPLY) { @@ -259,7 +259,7 @@ void applyAxisConstraintVec(TransInfo *t, TransData *td, float in[3], float out[ * */ -void applyAxisConstraintSize(TransInfo *t, TransData *td, float smat[3][3]) +static void applyAxisConstraintSize(TransInfo *t, TransData *td, float smat[3][3]) { if (!td && t->con.mode & CON_APPLY) { float tmat[3][3]; @@ -318,7 +318,7 @@ void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3][3]) * (ie: not doing counterclockwise rotations when the mouse moves clockwise). */ -void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3]) +static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3]) { if (!td && t->con.mode & CON_APPLY) { int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2); @@ -527,9 +527,9 @@ void BIF_setSingleAxisConstraint(float vec[3]) { t->redraw = 1; } -void BIF_drawConstraint() +void BIF_drawConstraint(void) { - int i = -1; + //int i = -1; TransInfo *t = BIF_GetTransInfo(); TransCon *tc = &(t->con); diff --git a/source/blender/src/transform_generics.h b/source/blender/src/transform_generics.h index d4e720850d8..a957bc3b059 100755 --- a/source/blender/src/transform_generics.h +++ b/source/blender/src/transform_generics.h @@ -60,7 +60,7 @@ void calculatePropRatio(TransInfo *t); void snapGrid(TransInfo *t, float *val); -TransInfo * BIF_GetTransInfo(); +TransInfo * BIF_GetTransInfo(void); #endif diff --git a/source/blender/src/view.c b/source/blender/src/view.c index c3ca9391a4c..ae068363a15 100644 --- a/source/blender/src/view.c +++ b/source/blender/src/view.c @@ -86,6 +86,10 @@ #define TRACKBALLSIZE (1.1) #define BL_NEAR_CLIP 0.001 + +/* local prototypes ----------*/ +void setcameratoview3d(void); /* windows.c & toets.c */ + void persp_general(int a) { /* for all window types, not 3D */ @@ -753,7 +757,7 @@ void setviewmatrixview3d() } } -void setcameratoview3d() +void setcameratoview3d(void) { Object *ob; float dvec[3]; |