Another purge of compiler warnings (some of which I've been getting for a while)...

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index f42d0fa79e22a673d9e943c604ccaaee7744654a..07fe8bbee31d411bd6f939105a8ee973ed5b8895 100644 (file)
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -1686,7 +1686,9 @@ void build_particle_system(Object *ob)
        float *volengths= NULL, *folengths= NULL;
        int deform=0, a, totpart, paf_sta, paf_end;
        int waitcursor_set= 0, totvert, totface, curface, curvert;
+#ifndef DISABLE_ELBEEM
        int readMask, activeParts, fileParts;
+#endif
        
        /* return conditions */
        if(ob->type!=OB_MESH) return;

diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index b071331e46b3e0ccb3fc9270b639a52faa98bdd8..5e6335cdac18f3c993a68a227a69216695c91f47 100644 (file)
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -53,6 +53,7 @@
 #include <unistd.h>
 #endif
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index 7dd116d0fad931916350036110d0fbbc98cd6e7d..27584d569cf538fabdb97abdf10cc0f0379fcf03 100644 (file)
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -6507,7 +6507,7 @@ void mesh_rotate_uvs(void)
 {
        EditMesh *em = G.editMesh;
        EditFace *efa;
-       short change;
+       short change = 0;
        MTFace *tf;
        float u1, v1;
        
@@ -6553,7 +6553,7 @@ void mesh_mirror_uvs(void)
 {
        EditMesh *em = G.editMesh;
        EditFace *efa;
-       short change;
+       short change = 0;
        MTFace *tf;
        float u1, v1;
        
@@ -6603,7 +6603,7 @@ void mesh_rotate_colors(void)
 {
        EditMesh *em = G.editMesh;
        EditFace *efa;
-       short change;
+       short change = 0;
        MCol tmpcol, *mcol;
        if (!EM_vertColorCheck()) {
                error("mesh has no color layers");
@@ -6638,7 +6638,7 @@ void mesh_mirror_colors(void)
 {
        EditMesh *em = G.editMesh;
        EditFace *efa;
-       short change;
+       short change = 0;
        MCol tmpcol, *mcol;
        if (!EM_vertColorCheck()) {
                error("mesh has no color layers");

diff --git a/source/blender/src/parametrizer.c b/source/blender/src/parametrizer.c
index d70d25ecd310923e51ce9621e79eb2de221b0839..62a07a437b01f3ea06a51d5c51affc8a3b3a542e 100644 (file)
--- a/source/blender/src/parametrizer.c
+++ b/source/blender/src/parametrizer.c
@@ -2771,8 +2771,6 @@ static void p_chart_lscm_begin(PChart *chart, PBool live, PBool abf)
 #endif
 
                if (abf) {
-                       PBool p_chart_abf_solve(PChart *chart);
-
                        if (!p_chart_abf_solve(chart))
                                param_warning("ABF solving failed: falling back to LSCM.\n");
                }