Commit cfcd7b97 authored by Jan Möbius's avatar Jan Möbius

Fixed warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16353 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f1519236
......@@ -190,7 +190,6 @@ void TextureControlPlugin::slotMultiTextureAdded( QString _textureGroup , QStrin
slotTextureAdded( _name , _filename , 2 , _id);
// Get the id of the new texture
_textureId = -1;
_textureId = texData->texture(_name).id();
//hide the texture (its accessible through the multiTexture)
......
......@@ -188,8 +188,7 @@ int TextureData::addTexture ( Texture _texture, GLuint _glName ) {
}
bool TextureData::addMultiTexture( QString _textureName ) {
int textureid = -1;
textureid = getTextureIndex(_textureName);
int textureid = getTextureIndex(_textureName);
if ( textureid != -1) {
std::cerr << "Texture exists!" << std::endl;
......@@ -212,8 +211,7 @@ bool TextureData::addMultiTexture( QString _textureName ) {
/// Stores the given image in the texture information
bool TextureData::setImage( QString _textureName , int _id ) {
int textureid = -1;
textureid = getTextureIndex(_textureName);
int textureid = getTextureIndex(_textureName);
if ( textureid == -1) {
std::cerr << "setImage: Unknown Texture!" << 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