forked from bartvdbraak/blender
Adding missing prototypes, removing unused variables, initializing vars,
all to make compiling warning less again in gcc. :)
This commit is contained in:
parent
0a2b71a3a4
commit
e63f211721
@ -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
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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[] ;
|
||||
|
@ -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();
|
||||
|
||||
|
@ -64,6 +64,7 @@
|
||||
|
||||
#include "BKE_blender.h"
|
||||
#include "BKE_utildefines.h"
|
||||
#include "BKE_font.h"
|
||||
#include "BKE_global.h"
|
||||
|
||||
#include "BIF_gl.h"
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user