o some warning fixes (compare of int to NULL, missing prototype)

This commit is contained in:
Daniel Dunbar
2005-10-09 16:57:49 +00:00
parent b9e6e0c2ec
commit af8b623002
5 changed files with 7 additions and 6 deletions

View File

@@ -1435,7 +1435,6 @@ DerivedMesh *derivedmesh_from_displistmesh(DispListMesh *dlm, float (*vertexCos)
/***/
DerivedMesh *mesh_create_derived_for_modifier(Object *ob, ModifierData *md)
{
Mesh *me = ob->data;
@@ -1591,7 +1590,7 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3], DerivedM
}
}
static vec3f *editmesh_getVertexCos(EditMesh *em, int *numVerts_r)
static float (*editmesh_getVertexCos(EditMesh *em, int *numVerts_r))[3]
{
int i, numVerts = *numVerts_r = BLI_countlist(&em->verts);
float (*cos)[3];

View File

@@ -256,7 +256,7 @@ void make_local_obipo(Ipo *ipo)
ob= ob->id.next;
}
if(local && lib==NULL) {
if(local && lib==0) {
ipo->id.lib= 0;
ipo->id.flag= LIB_LOCAL;
new_id(0, (ID *)ipo, 0);
@@ -300,7 +300,7 @@ void make_local_matipo(Ipo *ipo)
ma= ma->id.next;
}
if(local && lib==NULL) {
if(local && lib==0) {
ipo->id.lib= 0;
ipo->id.flag= LIB_LOCAL;
new_id(0, (ID *)ipo, 0);
@@ -344,7 +344,7 @@ void make_local_keyipo(Ipo *ipo)
key= key->id.next;
}
if(local && lib==NULL) {
if(local && lib==0) {
ipo->id.lib= 0;
ipo->id.flag= LIB_LOCAL;
new_id(0, (ID *)ipo, 0);

View File

@@ -5,6 +5,7 @@
*/
#include <string.h>
#include <stdlib.h>
#include "MEM_guardedalloc.h"

View File

@@ -1611,3 +1611,4 @@ PyObject *BGL_Init(void)
return mod;
}

View File

@@ -966,7 +966,7 @@ static MenuData *menudata_new(char *instr) {
md->instr= instr;
md->title= NULL;
md->titleicon= NULL;
md->titleicon= 0;
md->items= NULL;
md->nitems= md->itemssize= 0;