From e63f2117219db6b46325e8a60965530941f9710c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 15 Sep 2005 17:32:24 +0000 Subject: [PATCH] Adding missing prototypes, removing unused variables, initializing vars, all to make compiling warning less again in gcc. :) --- source/blender/include/BIF_editfont.h | 1 + source/blender/src/drawimage.c | 1 + source/blender/src/editmesh_tools.c | 6 +++--- source/blender/src/header_image.c | 1 - source/blender/src/header_info.c | 14 -------------- source/blender/src/interface_draw.c | 1 + source/blender/src/space.c | 11 +---------- 7 files changed, 7 insertions(+), 28 deletions(-) diff --git a/source/blender/include/BIF_editfont.h b/source/blender/include/BIF_editfont.h index 081bea67145..0c2c9d2779f 100644 --- a/source/blender/include/BIF_editfont.h +++ b/source/blender/include/BIF_editfont.h @@ -60,6 +60,7 @@ void txt_export_to_objects(struct Text *text); void undo_push_font(char *); void load_3dtext_fs(char *); void add_lorem(void); +void paste_unicodeText(char *filename); /** * @attention The argument is discarded. It is there for diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index efbab9c4a53..1a69cdb4338 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -82,6 +82,7 @@ #include "BIF_screen.h" #include "BIF_transform.h" +#include "BSE_headerbuttons.h" #include "BSE_trans_types.h" #include "BSE_view.h" diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 0ea80d37df1..eff40c3c476 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -4475,12 +4475,12 @@ int EdgeSlide(short immediate, float imperc) GHash *vertgh; SlideVert *tempsv; float perc = 0, percp = 0,vertdist, projectMat[4][4], viewMat[4][4]; + float shiftlabda= 0.0f; int i = 0,j, numsel, numadded=0, timesthrough = 0, vertsel=0, prop=1, cancel = 0,flip=0; + int wasshift = 0; short event, draw=1; short mval[2], mvalo[2]; char str[128]; - int wasshift = 0; - float shiftlabda; view3d_get_object_project_mat(curarea, G.obedit, projectMat, viewMat); @@ -4787,7 +4787,7 @@ int EdgeSlide(short immediate, float imperc) while(draw){ /* For the % calculation */ short mval[2]; - float labda, rc[2], len; + float labda=0.0f, rc[2], len=0.0f; float v2[2], v3[2]; EditVert *centerVert, *upVert, *downVert; diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 55f4b640bc7..85382b6aaed 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -728,7 +728,6 @@ static void do_image_imagemenu(void *arg, int event) char str[256]; Image *ima; ImBuf *ibuf; - char name[256]; BrushUIdata *data = NULL; extern short UVTEXTTOOL_INDEX; extern BrushUIdata UVTEXTTOOL_DATA[] ; diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index e2bb0fc4f9d..f656591879d 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1447,22 +1447,8 @@ static uiBlock *info_timelinemenu(void *arg_unused) /************************** RENDER *****************************/ -/* copied from buttons.c. .. probably not such a good idea!? */ -static void run_playanim(char *file) -{ - extern char bprogname[]; /* usiblender.c */ - char str[FILE_MAXDIR+FILE_MAXFILE]; - int pos[2], size[2]; - - calc_renderwin_rectangle(G.winpos, pos, size); - - sprintf(str, "%s -a -p %d %d \"%s\"", bprogname, pos[0], pos[1], file); - system(str); -} - static void do_info_rendermenu(void *arg, int event) { - char file[FILE_MAXDIR+FILE_MAXFILE]; extern void playback_anim(); diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index 4d933abab69..cf47eab6f33 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -64,6 +64,7 @@ #include "BKE_blender.h" #include "BKE_utildefines.h" +#include "BKE_font.h" #include "BKE_global.h" #include "BIF_gl.h" diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 962d4ae945e..30b1d01cbdd 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3750,16 +3750,7 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) unsigned short event= evt->event; short val= evt->val; SpaceImage *sima= curarea->spacedata.first; - View2D *v2d= &sima->v2d; -#ifdef NAN_TPT - IMG_BrushPtr brush; - IMG_CanvasPtr canvas; - int rowBytes; - short xy_prev[2], xy_curr[2]; - float uv_prev[2], uv_curr[2]; - extern VPaint Gvp; -#endif /* NAN_TPT */ - short paintmousebut; + short paintmousebut=0; if(val==0) return;