← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/deform.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/deform.c
537
537
 
538
538
        body[0] = suf[0] = '\0';
539
539
 
540
 
        for (i = len - 1; i > 1; i--) {
 
540
        for (i = len; i > 0; i--) {
541
541
                if (is_char_sep(string[i])) {
542
542
                        BLI_strncpy(body, string, i + 1);
543
543
                        BLI_strncpy(suf, string + i,  (len + 1) - i);
545
545
                }
546
546
        }
547
547
 
548
 
        BLI_strncpy(body, string, len);
 
548
        memcpy(body, string, len + 1);
549
549
}
550
550
 
551
551
/* "a.b.c" -> ("a.", "b.c") */
735
735
        if (dw_new)
736
736
                return dw_new;
737
737
 
738
 
        dw_new = MEM_callocN(sizeof(MDeformWeight) * (dvert->totweight + 1), "deformWeight");
 
738
        dw_new = MEM_mallocN(sizeof(MDeformWeight) * (dvert->totweight + 1), "deformWeight");
739
739
        if (dvert->dw) {
740
740
                memcpy(dw_new, dvert->dw, sizeof(MDeformWeight) * dvert->totweight);
741
741
                MEM_freeN(dvert->dw);