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/subsurf_ccg.c | |
parent | bb580664e6eae0714ec54f1cefeec5c5560150fc (diff) |
Fix warnings and remove casts by adding copy_vx_vx_uchar() functions.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 509ca9cdd19..f351ce0ff41 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2167,7 +2167,7 @@ static void ccgDM_buffer_copy_color( CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm; CCGSubSurf *ss = ccgdm->ss; CCGKey key; - const char *mloopcol = user_data; + const unsigned char *mloopcol = user_data; int gridSize = ccgSubSurf_getGridSize(ss); int gridFaces = gridSize - 1; int i, totface = ccgSubSurf_getNumFaces(ss); @@ -2184,10 +2184,10 @@ static void ccgDM_buffer_copy_color( for (S = 0; S < numVerts; S++) { for (y = 0; y < gridFaces; y++) { for (x = 0; x < gridFaces; x++) { - copy_v3_v3_char((char *)&varray[start + 0], &mloopcol[iface * 16 + 0]); - copy_v3_v3_char((char *)&varray[start + 3], &mloopcol[iface * 16 + 12]); - copy_v3_v3_char((char *)&varray[start + 6], &mloopcol[iface * 16 + 8]); - copy_v3_v3_char((char *)&varray[start + 9], &mloopcol[iface * 16 + 4]); + copy_v3_v3_uchar(&varray[start + 0], &mloopcol[iface * 16 + 0]); + copy_v3_v3_uchar(&varray[start + 3], &mloopcol[iface * 16 + 12]); + copy_v3_v3_uchar(&varray[start + 6], &mloopcol[iface * 16 + 8]); + copy_v3_v3_uchar(&varray[start + 9], &mloopcol[iface * 16 + 4]); start += 12; iface++; |