A little more cleanup, removed a bunch of unused vars in the code.

Trying to get rid of some of the extra warnings we can ignore ;)

Kent
This commit is contained in:
Kent Mein 2003-08-14 15:18:45 +00:00
parent 80f3d5863e
commit abede3ca04
18 changed files with 13 additions and 40 deletions

@ -156,8 +156,6 @@ AddPolygon(
if (verts == NULL || num_verts <3) return;
const int vertex_num = m_verts->size();
// make a polyscone from these vertex indices.
const BSP_FaceInd fi = m_faces->size();
@ -203,7 +201,6 @@ AddSubTriangle(
){
// This creates a new polygon on the end of the face list.
const BSP_FaceInd fi = m_faces->size();
m_faces->push_back(BSP_MFace());
BSP_MFace & face = m_faces->back();

@ -177,7 +177,6 @@ Build(
// choose a plane for the node. The first index in this
// mesh fragment will do for now.
vector<BSP_MVertex> & verts = m_mesh->VertexSet();
// choose a random splitting plane
@ -233,7 +232,6 @@ Push(
// fragment onto the output
vector<BSP_FaceInd>::const_iterator in_frag_it = in_frag->FaceSet().begin();
vector<BSP_FaceInd>::const_iterator in_frag_end = in_frag->FaceSet().end();
vector<BSP_MFace>::iterator faces = in_frag->Mesh()->FaceSet().begin();
if (keep == current || current == e_classified_on) {
for (;in_frag_it != in_frag_end; ++ in_frag_it) {

@ -526,7 +526,6 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype,
{
float M_oldmat[4][4];
float M_identity[4][4];
float enforce = 1.0;
if (!constraint || !ob)
return;

@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "zlib.h"

@ -431,7 +431,6 @@ BLO_readblenfilememory(
int fromBufferSize,
BlendReadError *error_r)
{
static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilememory\n";
int magiclen = strlen(headerMagic);
BlendFileData *bfd = NULL;
@ -495,7 +494,6 @@ BLO_readblenfilehandle(
int fd,
BlendReadError *error_r)
{
static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilehandle\n";
int magiclen = strlen(headerMagic);
BlendFileData *bfd = NULL;
char tempbuffer[256];
@ -543,7 +541,6 @@ BLO_readblenfilename(
char *fileName,
BlendReadError *error_r)
{
static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilename\n";
BlendFileData *bfd = NULL;
int fd;
@ -603,7 +600,6 @@ blo_read_runtime(
char *path,
BlendReadError *error_r)
{
static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_read_runtime\n";
BlendFileData *bfd= NULL;
int fd, datastart;
char buf[8];

@ -114,11 +114,8 @@ void meshactionbuts(SpaceAction *saction, Key *key)
{
int i;
char str[64];
char keyname[32];
float x, y, ybase;
float x, y;
uiBlock *block;
uiBut *but;
short ofsx, ofsy = 0;
#define RVKBGCOL .6, .65, .7
#define XIC 20
#define YIC 20

@ -761,7 +761,7 @@ void snap_sel_to_curs()
TransVert *tv;
Base *base;
Object *ob;
float gridf, *curs, imat[3][3], bmat[3][3], vec[3];
float *curs, imat[3][3], bmat[3][3], vec[3];
int a;
curs= give_cursor();
@ -933,7 +933,7 @@ void snap_curs_to_firstsel()
TransVert *tv;
Base *base;
float *curs, bmat[3][3], vec[3], min[3], max[3], centroid[3];
int count, a;
int count;
curs= give_cursor();
@ -1005,7 +1005,7 @@ void snap_to_center()
TransVert *tv;
Base *base;
Object *ob;
float gridf, snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
float snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
int count, a;

@ -122,8 +122,6 @@ static void transform_meshchannel_keys(char mode, Key *key);
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 clever_numbuts_meshaction(Key *key, short* mval);
/* Implementation */
short showsliders = 0;
@ -2142,7 +2140,6 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
unsigned short event= evt->event;
short val= evt->val;
char ascii= evt->ascii;
SpaceAction *saction;
bAction *act;
int doredraw= 0;
@ -2487,7 +2484,7 @@ int get_nearest_key_num(Key *key, short *mval, float *x) {
static void clever_keyblock_names(Key *key, short* mval){
int but=0, i, keynum;
char str[64];
float x, min, max;
float x;
KeyBlock *kb;
/* get the keynum cooresponding to the y value
* of the mouse pointer, return if this is

@ -89,7 +89,6 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
unsigned short event= evt->event;
short val= evt->val;
char ascii= evt->ascii;
SpaceImaSel *simasel;
short mval[2];

@ -115,7 +115,6 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
unsigned short event= evt->event;
short val= evt->val;
char ascii= evt->ascii;
SpaceNla *snla = curarea->spacedata.first;
int doredraw= 0;
short mval[2];

@ -1738,9 +1738,7 @@ void convertmenu(void)
void flip_subdivison(Object *ob, int level)
{
Base *base;
Mesh *me, *tme;
short i, j;
Mesh *me;
me = ob->data;

@ -609,7 +609,6 @@ void clever_numbuts_oops()
{
Oops *oops;
Object *ob;
ID *id = idt;
char str1[10];
static char naam[256];
static char naam2[256];

@ -101,7 +101,6 @@ void winqreadsoundspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
unsigned short event= evt->event;
short val= evt->val;
char ascii= evt->ascii;
float dx, dy;
int doredraw= 0, cfra, first = 0;
short mval[2];

@ -1797,7 +1797,7 @@ static void fs_fake_users(SpaceFile *sfile)
static int get_hilited_entry(SpaceFile *sfile)
{
int a, count=0;
int a;
for(a=0; a<sfile->totfile; a++) {
if(sfile->filelist[a].flags & HILITE) {
@ -1812,7 +1812,6 @@ void winqreadfilespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{
unsigned short event= evt->event;
short val= evt->val;
char ascii= evt->ascii;
static int acto=0;
SpaceFile *sfile;
int act, do_draw= 0, i, test, ret = 0;

@ -463,8 +463,8 @@ void select_parent(void) /* Makes parent active and de-selected OBACT */
void group_menu(void)
{
Base *base;
short nr, len;
char *str, tstr[40];
short nr;
char *str;
/* make menu string */

@ -134,8 +134,6 @@
void BIF_read_file(char *name)
{
extern short winqueue_break; /* editscreen.c */
extern char datatoc_splash_jpg[];
extern int datatoc_splash_jpg_size;
//here?
//sound_end_all_sounds();
@ -159,9 +157,9 @@ int BIF_read_homefile(void)
char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
char *home= BLI_gethome();
int success;
#ifdef _WIN32 // FULLSCREEN
static int screenmode = -1;
#ifdef _WIN32 // FULLSCREEN
screenmode = U.uiflag & FLIPFULLSCREEN;
#endif
@ -519,8 +517,6 @@ extern ListBase editelems;
void exit_usiblender(void)
{
extern char *fsmenu; /* filesel.c */
freeAllRad();
BKE_freecubetable();

@ -111,7 +111,6 @@ int BLO_writeblenfile(
unsigned int dataIn,
struct streamGlueHeaderStruct *streamGlueHeader)
{
static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_writeblenfile\n";
struct BLO_writeblenfileStruct *writeblenfileStruct = 0;
int fileDes;
extern int mywfile;

@ -174,7 +174,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
if (objectdrawmode & RAS_IPolyMaterial::SHADOW)
{
// shadow must be cast to the ground, physics system needed here!
KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
// KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
MT_Vector3 direction = MT_Vector3(0,0,-1);
@ -182,7 +182,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
direction.normalize();
direction *= 100000;
MT_Point3 topoint = frompoint + direction;
// MT_Point3 topoint = frompoint + direction;
MT_Point3 resultpoint;
MT_Vector3 resultnormal;