From bfa0e751dd39ce2bed090cb1a3a5239bfac3661d Mon Sep 17 00:00:00 2001 From: unelsson Date: Thu, 5 Jan 2023 01:34:26 +0200 Subject: [PATCH] Skip merging for only animated models (Collada) --- apps/openmw/mwrender/objectpaging.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp index b3f03de33c..4d847a3619 100644 --- a/apps/openmw/mwrender/objectpaging.cpp +++ b/apps/openmw/mwrender/objectpaging.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -16,7 +17,6 @@ #include #include -#include #include #include #include @@ -645,7 +645,8 @@ namespace MWRender if (cnode->getNumChildrenRequiringUpdateTraversal() > 0 || SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel) || SceneUtil::hasUserDescription(cnode, Constants::HerbalismLabel) - || cnode->getName() == "Collada visual scene group") + || (cnode->getName() == "Collada visual scene group" + && dynamic_cast(cnode->getUpdateCallback()))) continue; else refnumSet->mRefnums.push_back(pair.first);