FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not modify danymically generated textures.

Browse Source 
Modified Files:
	simgear/scene/model/ModelRegistry.cxx
This commit is contained in:
frohlich
2009-06-07 11:50:01 +00:00
committed by Tim Moore
parent d4c52b599d
commit daa0fbdc6b
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/scene/model/ModelRegistry.cxx
View File

@@ -258,9 +258,13 @@ public:
if (!texture)
return;
// Hmm, true??
texture->setDataVariance(osg::Object::STATIC);
// Do not touch dynamically generated textures.
if (texture->getReadPBuffer())
return;
if (texture->getDataVariance() == osg::Object::DYNAMIC)
return;
// If no image attached, we assume this one is dynamically generated
Image* image = texture->getImage(0);
if (!image)
return;
@@ -285,6 +289,16 @@ public:
if (!texture)
return;
// Cannot be static if this is a render to texture thing
if (texture->getReadPBuffer())
return;
if (texture->getDataVariance() == osg::Object::DYNAMIC)
return;
// If no image attached, we assume this one is dynamically generated
Image* image = texture->getImage(0);
if (!image)
return;
texture->setDataVariance(Object::STATIC);
}
@@ -292,8 +306,8 @@ public:
{
if (!stateSet)
return;
SGTextureStateAttributeVisitor::apply(stateSet);
stateSet->setDataVariance(Object::STATIC);
SGTextureStateAttributeVisitor::apply(stateSet);
}
};