diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 02:58:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 03:01:17 +0300 |
| commit | 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e (patch) | |
| tree | 91c4fb3bbe944a4f9e0e6d72a25d12310872f849 /source/blender/blenloader/intern/versioning_legacy.c | |
| parent | 8400b4b566350bd9d726a07627e74f5a995280da (diff) | |
| parent | e6df02861e17f75d4dd243776f35208681b78465 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/versioning_legacy.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 6cb39a35b9d..b263ab15853 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -113,7 +113,7 @@ static void vcol_to_fcol(Mesh *me) if (me->totface == 0 || me->mcol == NULL) return; - mcoln = mcolmain = MEM_mallocN(4*sizeof(int)*me->totface, "mcoln"); + mcoln = mcolmain = MEM_malloc_arrayN(me->totface, 4 * sizeof(int), "mcoln"); mcol = (unsigned int *)me->mcol; mface = me->mface; for (a = me->totface; a > 0; a--, mface++) { |