kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Compiler warning fixes (part 1 or 2)

Browse Source
This commit is contained in:
Joshua Leung 2008-06-22 01:56:11 +00:00
parent 86d227367b
commit 1ee7a20b93
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/modifier.c
View File

@ -1422,10 +1422,10 @@ void vertgroup_flip_name (char *name, int strip_number)
} }
static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
Object *ob, Object *ob,
DerivedMesh *dm, DerivedMesh *dm,
int initFlags, int initFlags,
int axis) int axis)
{ {
int i; int i;
float tolerance = mmd->tolerance; float tolerance = mmd->tolerance;
@ -1434,7 +1434,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
int maxVerts = dm->getNumVerts(dm); int maxVerts = dm->getNumVerts(dm);
int maxEdges = dm->getNumEdges(dm); int maxEdges = dm->getNumEdges(dm);
int maxFaces = dm->getNumFaces(dm); int maxFaces = dm->getNumFaces(dm);
int vector_size, j, a, b; int vector_size=0, j, a, b;
bDeformGroup *def, *defb; bDeformGroup *def, *defb;
bDeformGroup **vector_def = NULL; bDeformGroup **vector_def = NULL;
int (*indexMap)[2]; int (*indexMap)[2];
@ -1627,7 +1627,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
test_index_face(mf2, &result->faceData, numFaces, inMF.v4?4:3); test_index_face(mf2, &result->faceData, numFaces, inMF.v4?4:3);
numFaces++; numFaces++;
} }
} }
if (vector_def) MEM_freeN(vector_def); if (vector_def) MEM_freeN(vector_def);
@ -1642,8 +1642,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
} }
static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd, static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd,
Object *ob, DerivedMesh *dm, Object *ob, DerivedMesh *dm,
int initFlags) int initFlags)
{ {
DerivedMesh *result = dm; DerivedMesh *result = dm;

2
source/blender/include/BIF_oops.h
View File

@ -43,6 +43,8 @@ struct Camera;
struct Texture; struct Texture;
struct Lattice; struct Lattice;
struct bArmature; struct bArmature;
struct Tex;
void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag); void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag);
void add_from_link(struct Oops *from, struct Oops *oops); void add_from_link(struct Oops *from, struct Oops *oops);
void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag); void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag);

1
source/blender/src/oops.c
View File

@ -1153,7 +1153,6 @@ void build_oops()
} }
} }
else if(type==ID_AR && G.soops->visiflag & OOPS_AR) { else if(type==ID_AR && G.soops->visiflag & OOPS_AR) {
bArmature *ar= ob->data;
oops= add_test_oops(ob->data); oops= add_test_oops(ob->data);
} }
} }