[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60825] trunk/blender/source/blender/ blenkernel/intern: Fix for GCC bing stupid and not casting float*[3] to const float*[3] without a wanring :S

[Sergey Sharybin]

Revision: 60825
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60825
Author:   nazgul
Date:     2013-10-17 14:44:23 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix for GCC bing stupid and not casting float*[3] to const float*[3] without a wanring :S

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-10-17 14:30:23 UTC (rev 60824)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2013-10-17 14:44:23 UTC (rev 60825)
@@ -1068,7 +1068,7 @@
 
 	/* 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 @@
 
 	/* 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);
 	}

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-10-17 14:30:23 UTC (rev 60824)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-10-17 14:44:23 UTC (rev 60825)
@@ -1824,7 +1824,7 @@
 
 	/* 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 @@
 
 	/* 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 @@
 	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);