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

Bugfix

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5760 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2ad36ff2
...@@ -986,7 +986,7 @@ void TextureControlPlugin::doSwitchTexture( QString _textureName , int _id ) { ...@@ -986,7 +986,7 @@ void TextureControlPlugin::doSwitchTexture( QString _textureName , int _id ) {
if (!multiTextureMode) { if (!multiTextureMode) {
doUpdateTexture(texData->texture(_textureName), *PluginFunctions::triMeshObject(obj)->mesh()); doUpdateTexture(texData->texture(_textureName), *PluginFunctions::triMeshObject(obj)->mesh());
PluginFunctions::triMeshObject(obj)->textureNode()->activateTexture( texData->texture( _textureName ).glName() ); PluginFunctions::triMeshObject(obj)->textureNode()->activateTexture( texData->texture( _textureName ).glName() );
PluginFunctions::triMeshObject(obj)->meshNode()->set_index_property_name(0); PluginFunctions::triMeshObject(obj)->meshNode()->set_index_property_name("No Texture Index");
PluginFunctions::triMeshObject(obj)->meshNode()->set_texture_map( 0 ); PluginFunctions::triMeshObject(obj)->meshNode()->set_texture_map( 0 );
PluginFunctions::triMeshObject(obj)->meshNode()->set_property_map( 0 ); PluginFunctions::triMeshObject(obj)->meshNode()->set_property_map( 0 );
} else { } else {
...@@ -1001,7 +1001,7 @@ void TextureControlPlugin::doSwitchTexture( QString _textureName , int _id ) { ...@@ -1001,7 +1001,7 @@ void TextureControlPlugin::doSwitchTexture( QString _textureName , int _id ) {
if (!multiTextureMode) { if (!multiTextureMode) {
doUpdateTexture(texData->texture(_textureName), *PluginFunctions::polyMeshObject(obj)->mesh()); doUpdateTexture(texData->texture(_textureName), *PluginFunctions::polyMeshObject(obj)->mesh());
PluginFunctions::polyMeshObject(obj)->textureNode()->activateTexture( texData->texture( _textureName ).glName() ); PluginFunctions::polyMeshObject(obj)->textureNode()->activateTexture( texData->texture( _textureName ).glName() );
PluginFunctions::polyMeshObject(obj)->meshNode()->set_index_property_name(0); PluginFunctions::polyMeshObject(obj)->meshNode()->set_index_property_name("No Texture Index");
PluginFunctions::polyMeshObject(obj)->meshNode()->set_texture_map( 0 ); PluginFunctions::polyMeshObject(obj)->meshNode()->set_texture_map( 0 );
PluginFunctions::polyMeshObject(obj)->meshNode()->set_property_map( 0 ); PluginFunctions::polyMeshObject(obj)->meshNode()->set_property_map( 0 );
} else { } else {
......
...@@ -83,9 +83,7 @@ void texturePropertiesWidget::show(TextureData* _texData, int _id, QString _name ...@@ -83,9 +83,7 @@ void texturePropertiesWidget::show(TextureData* _texData, int _id, QString _name
textureList->clear(); textureList->clear();
for (uint i=0; i < texData_->textures().size(); i++) for (uint i=0; i < texData_->textures().size(); i++)
if ( texData_->textures()[i].hidden() ) { if ( ! texData_->textures()[i].hidden() ) {
std::cerr << "Handle Hidden" << std::endl;
} else {
if ( texData_->textures()[i].type() != MULTITEXTURE ) { if ( texData_->textures()[i].type() != MULTITEXTURE ) {
textureList->addTopLevelItem( new QTreeWidgetItem((QTreeWidget*)0, QStringList( texData_->textures()[i].name() ) ) ); textureList->addTopLevelItem( new QTreeWidgetItem((QTreeWidget*)0, QStringList( texData_->textures()[i].name() ) ) );
} else { } else {
......
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