diff options
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 1 | ||||
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 8 | ||||
| -rw-r--r-- | source/blender/src/parametrizer.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f42d0fa79e2..07fe8bbee31 100644 --- 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 b071331e46b..5e6335cdac1 100644 --- 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 7dd116d0fad..27584d569cf 100644 --- 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 d70d25ecd31..62a07a437b0 100644 --- 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"); } |