forked from bartvdbraak/blender
Patch 17403, small gcc warning fixes.
This commit is contained in:
parent
3dbdd8939b
commit
9b9edad6b6
@ -3339,7 +3339,7 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs *gattribs,
|
||||
void writeBobjgz(char *filename, struct Object *ob, int useGlobalCoords, int append, float time)
|
||||
{
|
||||
char debugStrBuffer[256];
|
||||
int wri,i,j,totvert,totface;
|
||||
int wri=0,i,j,totvert,totface;
|
||||
float wrf;
|
||||
gzFile gzf;
|
||||
DerivedMesh *dm;
|
||||
|
@ -77,8 +77,12 @@ void BLI_edgehash_insert(EdgeHash *eh, int v0, int v1, void *val) {
|
||||
unsigned int hash;
|
||||
Entry *e= malloc(sizeof(*e));
|
||||
|
||||
if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
|
||||
hash = EDGEHASH(v0,v1)%eh->nbuckets;
|
||||
if (v1<v0) {
|
||||
v0 ^= v1;
|
||||
v1 ^= v0;
|
||||
v0 ^= v1;
|
||||
}
|
||||
hash = EDGEHASH(v0,v1)%eh->nbuckets;
|
||||
|
||||
e->v0 = v0;
|
||||
e->v1 = v1;
|
||||
@ -114,7 +118,11 @@ void** BLI_edgehash_lookup_p(EdgeHash *eh, int v0, int v1) {
|
||||
unsigned int hash;
|
||||
Entry *e;
|
||||
|
||||
if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
|
||||
if (v1<v0) {
|
||||
v0 ^= v1;
|
||||
v1 ^= v0;
|
||||
v0 ^= v1;
|
||||
}
|
||||
hash = EDGEHASH(v0,v1)%eh->nbuckets;
|
||||
for (e= eh->buckets[hash]; e; e= e->next)
|
||||
if (v0==e->v0 && v1==e->v1)
|
||||
|
Loading…
Reference in New Issue
Block a user