Patch 17403, small gcc warning fixes.

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 328dcada01a94764dcab111c81004cc9b939ab25..5bc70e00891b7ed662421463026a1afe9dacc4f0 100644 (file)
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -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;

diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index 3e1c8afb7a8a26fe0f56049fec3cd9d07c774ce4..603c85655d75b3f48432eaece803d8ea187c390a 100644 (file)
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -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)