diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-18 10:01:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-18 10:01:33 +0400 |
commit | 3633858fdb1104c7b2ec23f3f1d53b6b367ae454 (patch) | |
tree | 795200869c3413b4d49bcb976d36401af47c2fee /source/blender/blenkernel | |
parent | dd8504ed871026cee74361ea859af09c90081268 (diff) |
code cleanup:
* replace 2D vector copy with copy_v2_v2().
* use puts rather then printf for single strings.
* style cleanup for drawobject.c indentation.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/report.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index c00218f8145..6c3c7581161 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3024,7 +3024,7 @@ char *DM_debug_info(DerivedMesh *dm) void DM_debug_print(DerivedMesh *dm) { char *str = DM_debug_info(dm); - printf("%s", str); + puts(str); fflush(stdout); MEM_freeN(str); } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index e81c814e3d5..d285f909f85 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2312,8 +2312,7 @@ void mesh_loops_to_mface_corners(CustomData *fdata, CustomData *ldata, for (j=0; j < mf_len; j++) { lof = CustomData_get(ldata, lindex[j], CD_ORIGSPACE_MLOOP); - of->uv[j][0] = lof->uv[0]; - of->uv[j][1] = lof->uv[1]; + copy_v2_v2(of->uv[j], lof->uv); } } } diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 73809e7b5e8..9ce1cba2794 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -256,7 +256,7 @@ void BKE_reports_print(ReportList *reports, ReportType level) if (cstring == NULL) return; - printf("%s", cstring); + puts(cstring); fflush(stdout); MEM_freeN(cstring); } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 44c519c5def..a0d603f93ff 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -409,22 +409,22 @@ static void set_subsurf_uv(CCGSubSurf *ss, DerivedMesh *dm, DerivedMesh *result, float *c = faceGridData[(y + 1)*gridSize + x + 1]; float *d = faceGridData[(y + 1)*gridSize + x + 0]; - if (tface) { - tf->uv[0][0] = a[0]; tf->uv[0][1] = a[1]; - tf->uv[1][0] = d[0]; tf->uv[1][1] = d[1]; - tf->uv[2][0] = c[0]; tf->uv[2][1] = c[1]; - tf->uv[3][0] = b[0]; tf->uv[3][1] = b[1]; + if (tf) { + copy_v2_v2(tf->uv[0], a); + copy_v2_v2(tf->uv[1], d); + copy_v2_v2(tf->uv[2], c); + copy_v2_v2(tf->uv[3], b); + tf++; } - if (mloopuv) { - mluv[0].uv[0] = a[0]; mluv[0].uv[1] = a[1]; - mluv[1].uv[0] = d[0]; mluv[1].uv[1] = d[1]; - mluv[2].uv[0] = c[0]; mluv[2].uv[1] = c[1]; - mluv[3].uv[0] = b[0]; mluv[3].uv[1] = b[1]; + if (mluv) { + copy_v2_v2(mluv[0].uv, a); + copy_v2_v2(mluv[1].uv, d); + copy_v2_v2(mluv[2].uv, c); + copy_v2_v2(mluv[3].uv, b); + mluv += 4; } - tf++; - mluv+=4; } } } diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 141d390d571..ffb8e830ed4 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -1674,7 +1674,7 @@ void txt_print_undo(Text *text) uc= uc+(text->undo_buf[i]<<24); i++; c_len= BLI_str_utf8_from_unicode(uc, c); c[c_len]= '\0'; - printf ("%s", c); + puts(c); } } } else if (op==UNDO_STO || op==UNDO_CTO) { |