diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-17 18:44:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-17 18:44:23 +0400 |
| commit | a0da34871a6eb75cba7fc3ed024f0dae53e0e3ea (patch) | |
| tree | cd936fca23c7938c6c875816bd25c5f0c1a7be52 /source/blender/blenkernel/intern | |
| parent | 1263a0891cc0d7d2602fa2668cc7ffa271624046 (diff) | |
Fix for GCC bing stupid and not casting float*[3] to const float*[3] without a wanring :S
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 309eb68ffc4..4846199b9d9 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1068,7 +1068,7 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int /* orco texture coordinates */ if (attribs->totorco) { - const float (*array)[3] = attribs->orco.array; + /*const*/ float (*array)[3] = attribs->orco.array; const float *orco = (array) ? array[index] : zero; if (attribs->orco.gl_texco) @@ -1112,7 +1112,7 @@ static void cddm_draw_attrib_vertex(DMVertexAttribs *attribs, MVert *mvert, int /* tangent for normal mapping */ if (attribs->tottang) { - const float (*array)[4] = attribs->tang.array; + /*const*/ float (*array)[4] = attribs->tang.array; const float *tang = (array) ? array[a * 4 + vert] : zero; glVertexAttrib4fvARB(attribs->tang.gl_index, tang); } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 176e79aff36..900d92d1637 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1824,7 +1824,7 @@ static void ccgdm_draw_attrib_vertex(DMVertexAttribs *attribs, int a, int index, /* orco texture coordinates */ if (attribs->totorco) { - const float (*array)[3] = attribs->orco.array; + /*const*/ float (*array)[3] = attribs->orco.array; const float *orco = (array) ? array[index] : zero; if (attribs->orco.gl_texco) @@ -1868,7 +1868,7 @@ static void ccgdm_draw_attrib_vertex(DMVertexAttribs *attribs, int a, int index, /* tangent for normal mapping */ if (attribs->tottang) { - const float (*array)[4] = attribs->tang.array; + /*const*/ float (*array)[4] = attribs->tang.array; const float *tang = (array) ? array[a * 4 + vert] : zero; glVertexAttrib4fvARB(attribs->tang.gl_index, tang); @@ -2028,7 +2028,7 @@ static void ccgDM_drawMappedFacesMat(DerivedMesh *dm, int gridFaces = gridSize - 1; int edgeSize = ccgSubSurf_getEdgeSize(ss); DMFlagMat *faceFlags = ccgdm->faceFlags; - int a, b, i, numVerts, matnr, new_matnr, totface; + int a, i, numVerts, matnr, new_matnr, totface; CCG_key_top_level(&key, ss); ccgdm_pbvh_update(ccgdm); |