[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40204] branches/soc-2011-cucumber/source/ gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp: pointers should be cast to long, not int (build fix for OSX+CMake+Make)
Dalai Felinto
dfelinto at gmail.com
Wed Sep 14 10:04:02 CEST 2011
Revision: 40204
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40204
Author: dfelinto
Date: 2011-09-14 08:04:00 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
pointers should be cast to long, not int (build fix for OSX+CMake+Make)
Modified Paths:
--------------
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
Modified: branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp 2011-09-14 07:07:17 UTC (rev 40203)
+++ branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp 2011-09-14 08:04:00 UTC (rev 40204)
@@ -144,7 +144,7 @@
case RAS_IRasterizer::RAS_TEXCO_UV:
glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->vbo_id);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- glTexCoordPointer(2, GL_FLOAT, this->stride, (void*)((int)this->uv_offset+(sizeof(GLfloat)*2*unit)));
+ glTexCoordPointer(2, GL_FLOAT, this->stride, (void*)((long)this->uv_offset+(sizeof(GLfloat)*2*unit)));
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->vbo_id);
@@ -186,7 +186,7 @@
break;
case RAS_IRasterizer::RAS_TEXCO_UV:
glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->vbo_id);
- glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, this->stride, (void*)((int)this->uv_offset+(sizeof(GLfloat)*2*uv++)));
+ glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, this->stride, (void*)((long)this->uv_offset+(sizeof(GLfloat)*2*uv++)));
glEnableVertexAttribArrayARB(unit);
break;
case RAS_IRasterizer::RAS_TEXCO_NORM:
@@ -274,4 +274,4 @@
vbo->Draw(*m_texco_num, m_texco, *m_attrib_num, m_attrib, multi);
}
-}
\ No newline at end of file
+}
More information about the Bf-blender-cvs
mailing list