mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'oripaging' into 'master'

Browse Source 
Try printing template textures if instance textures are unavailable for any reason

See merge request OpenMW/openmw!2709
This commit is contained in:
psi29a 2023-02-10 16:53:02 +00:00
commit d3874644c1
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwscript/miscextensions.cpp
View File

@ -1425,7 +1425,21 @@ namespace MWScript
SceneUtil::PositionAttitudeTransform* baseNode = ptr.getRefData().getBaseNode(); SceneUtil::PositionAttitudeTransform* baseNode = ptr.getRefData().getBaseNode();
if (baseNode) if (baseNode)
baseNode->accept(visitor); baseNode->accept(visitor);
// The instance might not have a physical model due to paging or scripting.
// If this is the case, fall back to the template
if (visitor.mTextures.empty())
{
Resource::SceneManager* sceneManager
= MWBase::Environment::get().getResourceSystem()->getSceneManager();
const_cast<osg::Node*>(sceneManager->getTemplate(model).get())->accept(visitor);
msg << "Bound textures: [None]" << std::endl;
if (!visitor.mTextures.empty())
msg << "Model textures: ";
}
else
{
msg << "Bound textures: "; msg << "Bound textures: ";
}
if (!visitor.mTextures.empty()) if (!visitor.mTextures.empty())
{ {
msg << std::endl; msg << std::endl;