diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-09-04 02:04:37 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-09-04 02:04:37 +0300 |
| commit | ef629e0d504ea6b53cf490f0f084d5a0b587bf6b (patch) | |
| tree | fbd9a87c2164176762811fdc9375b01bbca3ff41 /source/blender/modifiers | |
| parent | c3fef001ee926fc183255b623f56da9fc5fcbb73 (diff) | |
Quiet warnings
We had too many warnings lately... was awaiting that someone would kill them - didn't happen -> goes to my commit ratio! :P
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 7523c7c7525..b20d7d8a3a9 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -235,7 +235,8 @@ static void displaceModifier_do( clnors = CustomData_get_layer(ldata, CD_NORMAL); vert_clnors = MEM_mallocN(sizeof(*vert_clnors) * (size_t)numVerts, __func__); - BKE_mesh_normals_loop_to_vertex(numVerts, dm->getLoopArray(dm), dm->getNumLoops(dm), clnors, vert_clnors); + BKE_mesh_normals_loop_to_vertex(numVerts, dm->getLoopArray(dm), dm->getNumLoops(dm), + (const float (*)[3])clnors, vert_clnors); } else { direction = MOD_DISP_DIR_NOR; diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index db65f4431e4..33a8520fc51 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -176,7 +176,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, MLoopUV **mloopuv_layers = BLI_array_alloca(mloopuv_layers, mloopuv_layers_tot); float uv_u_scale; float uv_v_minmax[2] = {FLT_MAX, -FLT_MAX}; - float uv_v_range_inv; + float uv_v_range_inv = 0.0f; float uv_axis_plane[4]; char axis_char = 'X'; @@ -196,7 +196,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, unsigned int edge_offset; - MPoly *mpoly_orig, *mpoly_new, *mp_new; + MPoly *mpoly_orig = NULL, *mpoly_new, *mp_new; MLoop *mloop_orig, *mloop_new, *ml_new; MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new; MVert *mvert_new, *mvert_orig, *mv_orig, *mv_new, *mv_new_base; @@ -877,7 +877,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, const unsigned int step_last = step_tot - (close ? 1 : 2); const unsigned int mpoly_index_orig = totpoly ? edge_poly_map[i] : UINT_MAX; const bool has_mpoly_orig = (mpoly_index_orig != UINT_MAX); - float uv_v_offset_a, uv_v_offset_b; + float uv_v_offset_a = 0.0f, uv_v_offset_b = 0.0f; const unsigned int mloop_index_orig[2] = { vert_loop_map ? vert_loop_map[medge_new[i].v1] : UINT_MAX, |