diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-11 02:44:47 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-11 03:15:44 +0300 |
commit | 6e66ddf5ed29c2593dbd25d4fd48b36c2e68e411 (patch) | |
tree | 227df0cc568ab72f9b350b9cccb1700b727744c4 /source/blender/blenkernel/intern/cdderivedmesh.c | |
parent | bb580664e6eae0714ec54f1cefeec5c5560150fc (diff) |
Fix warnings and remove casts by adding copy_vx_vx_uchar() functions.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 7c3287e6934..989e5e3a624 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -967,7 +967,7 @@ static void cdDM_drawMappedFacesGLSL( int *mat_orig_to_new; int tot_active_mat; GPUBuffer *buffer = NULL; - char *varray; + unsigned char *varray; size_t max_element_size = 0; int tot_loops = 0; @@ -1072,7 +1072,7 @@ static void cdDM_drawMappedFacesGLSL( if (matconv[i].attribs.mcol[b].array) { const MLoopCol *mloopcol = matconv[i].attribs.mcol[b].array; for (j = 0; j < mpoly->totloop; j++) - copy_v4_v4_char((char *)&varray[offset + j * max_element_size], &mloopcol[mpoly->loopstart + j].r); + copy_v4_v4_uchar(&varray[offset + j * max_element_size], &mloopcol[mpoly->loopstart + j].r); offset += sizeof(unsigned char) * 4; } } @@ -1482,7 +1482,7 @@ static void cdDM_buffer_copy_mcol( for (i = 0; i < totpoly; i++, mpoly++) { for (j = 0; j < mpoly->totloop; j++) { - copy_v3_v3_char((char *)&varray[start], &mloopcol[mpoly->loopstart + j].r); + copy_v3_v3_uchar(&varray[start], &mloopcol[mpoly->loopstart + j].r); start += 3; } } |