Commit: 9b8be0bc0c497d0682b439e3d10bea1f83a3d115
Author: Bastien Montagne
Date: Sat Nov 1 16:34:35 2014 +0100
Branches: master
https://developer.blender.org/rB9b8be0bc0c497d0682b439e3d10bea1f83a3d115
Cleanup/fix from latest coverity report.
Mostly harmless things, though the 'multires' error was a real bug.
===================================================================
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/tracking_auto.c
M source/blender/bmesh/tools/bmesh_region_match.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/modifiers/intern/MOD_meshdeform.c
===================================================================
diff --git a/source/blender/blenkernel/intern/multires.c
b/source/blender/blenkernel/intern/multires.c
index 9f5e049..0adc65b 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -1600,7 +1600,7 @@ void multires_load_old_250(Mesh *me)
int nvert = mf->v4 ? 4 : 3;
int totdisp = mdisps[i].totdisp / nvert;
- for (j = 0; j < mf->v4 ? 4 : 3; j++, k++) {
+ for (j = 0; j < nvert; j++, k++) {
mdisps2[k].disps = MEM_callocN(sizeof(float) *
3 * totdisp, "multires disp in conversion");
mdisps2[k].totdisp = totdisp;
mdisps2[k].level = mdisps[i].level;
diff --git a/source/blender/blenkernel/intern/tracking_auto.c
b/source/blender/blenkernel/intern/tracking_auto.c
index 11753d7..1b1445e 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -322,7 +322,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
}
for (i = 0; i < track->markersnr; ++i) {
- MovieTrackingMarker *marker = marker = track->markers +
i;
+ MovieTrackingMarker *marker = track->markers + i;
if ((marker->flag & MARKER_DISABLED) == 0) {
libmv_Marker libmv_marker;
dna_marker_to_libmv_marker(track,
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c
b/source/blender/bmesh/tools/bmesh_region_match.c
index 050d5ae..4e714f8 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.c
+++ b/source/blender/bmesh/tools/bmesh_region_match.c
@@ -874,7 +874,7 @@ static BMFace **bm_mesh_region_match_pair(
const unsigned int faces_result_len = (unsigned
int)BLI_ghash_size(w_dst->faces_uuid);
unsigned int i;
- faces_result = MEM_mallocN(sizeof(faces_result) *
(faces_result_len + 1), __func__);
+ faces_result = MEM_mallocN(sizeof(*faces_result) *
(faces_result_len + 1), __func__);
GHASH_ITER_INDEX (gh_iter, w_dst->faces_uuid, i) {
BMFace *f = BLI_ghashIterator_getKey(&gh_iter);
faces_result[i] = f;
diff --git a/source/blender/editors/uvedit/uvedit_ops.c
b/source/blender/editors/uvedit/uvedit_ops.c
index 35a9bb9..bcddd6b 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1771,7 +1771,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator
*op)
if ((vert_arr[uv_b_index].weld ==
false) &&
(len_manhattan_v2v2(uv_a, uv_b) <
threshold))
{
- minmax_v2v2_v2(uv_max, uv_min,
uv_b);
+ minmax_v2v2_v2(uv_min, uv_max,
uv_b);
BLI_array_append(loop_arr,
vert_arr[uv_b_index].uv_loop);
vert_arr[uv_b_index].weld =
true;
}
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c
b/source/blender/modifiers/intern/MOD_meshdeform.c
index c509bf4..472f35f 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -223,7 +223,7 @@ static void meshdeform_vert_task(void *userdata, int iter)
const MDeformVert *dvert = data->dvert;
const int defgrp_index = data->defgrp_index;
const int *offsets = mmd->bindoffsets;
- const MDefInfluence *influences = influences = mmd->bindinfluences;
+ const MDefInfluence *influences = mmd->bindinfluences;
/*const*/ float (*dco)[3] = data->dco;
float (*vertexCos)[3] = data->vertexCos;
float co[3];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
