diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-01 18:34:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-01 18:36:11 +0300 |
| commit | 9b8be0bc0c497d0682b439e3d10bea1f83a3d115 (patch) | |
| tree | bcdf81d899e17ac6145208a3e24cbc44cce571cb /source/blender/blenkernel | |
| parent | cbf2fab9ea51ff89845a527cf14a360faabbdd38 (diff) | |
Cleanup/fix from latest coverity report.
Mostly harmless things, though the 'multires' error was a real bug.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/tracking_auto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 9f5e049fe24..0adc65bd806 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 11753d7d14c..1b1445eae26 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, |