Commit 849c0528 authored by Matthias Möller's avatar Matthias Möller
Browse files

type conversion

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17199 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b9ad8044
......@@ -680,7 +680,7 @@ private:
/** used to track mesh changes, that require a full rebuild
* values directly taken from Mesh template
*/
unsigned int prevNumFaces_,prevNumVerts_;
size_t prevNumFaces_,prevNumVerts_;
// per material/texture subsets
......
......@@ -343,7 +343,7 @@ void IRenderer::bindObjectUniforms( ACG::RenderObject* _obj, GLSL::Program* _pro
if (!tex.id)
continue;
glActiveTexture(GL_TEXTURE0 +texture_stage);
glActiveTexture(GL_TEXTURE0 + (GLenum)texture_stage);
glBindTexture(iter->second.type, tex.id);
_prog->setUniform(QString("g_Texture%1").arg(texture_stage).toStdString().c_str(), (int)texture_stage);
}
......
......@@ -1245,7 +1245,7 @@ MeshNodeT<Mesh>::
pick_any(GLState& _state)
{
GLenum prev_depth = _state.depthFunc();
unsigned int numElements = mesh_.n_faces() + mesh_.n_edges() + mesh_.n_vertices();
size_t numElements = mesh_.n_faces() + mesh_.n_edges() + mesh_.n_vertices();
if ( mesh_.n_vertices() == 0 ) {
std::cerr << "pick_any: No vertices in Mesh!" << std::endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment