Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

This PR solves a crash with Robert's bodies logged on your bugtracker. #3095

Merged
merged 15 commits into from
Sep 9, 2021
Merged

This PR solves a crash with Robert's bodies logged on your bugtracker. #3095

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4e38f63
attach.cpp [ci skip]
bosvensson1 Sep 5, 2021
b7a0398
attach.cpp [ci skip]
bosvensson1 Sep 5, 2021
ec4d7e8
attach.cpp [ci skip]
bosvensson1 Sep 5, 2021
6ce9b33
npcanimation.cpp [ci skip]
bosvensson1 Sep 5, 2021
9ee2cbf
attach.hpp [ci skip]
bosvensson1 Sep 5, 2021
dfa9f7c
attach.cpp [ci skip]
bosvensson1 Sep 5, 2021
6f8ac89
creatureanimation.cpp [ci skip]
bosvensson1 Sep 5, 2021
4b04dc5
creatureanimation.cpp [ci skip]
bosvensson1 Sep 5, 2021
e91959b
cellpreloader.cpp
bosvensson1 Sep 5, 2021
81bcc41
npcanimation.cpp
bosvensson1 Sep 5, 2021
ef3bacf
attach.cpp
bosvensson1 Sep 5, 2021
761cee1
make android adk happy
bosvensson1 Sep 6, 2021
0580729
make android adk happy
bosvensson1 Sep 6, 2021
919e42a
changelog.md [ci skip]
bosvensson1 Sep 7, 2021
3219f22
authors.md [ci skip]
bosvensson1 Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
npcanimation.cpp [ci skip]
  • Loading branch information
@bosvensson1
bosvensson1 committed Sep 5, 2021
commit 6ce9b3399d6403ddb24a412ee7fc6b455a619868
4 changes: 2 additions & 2 deletions apps/openmw/mwrender/npcanimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,14 +714,14 @@ void NpcAnimation::updateParts()

PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor)
{
osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
osg::ref_ptr<const osg::Node> template = mResourceSystem->getSceneManager()->getTemplate(model);

const NodeMap& nodeMap = getNodeMap();
NodeMap::const_iterator found = nodeMap.find(Misc::StringUtils::lowerCase(bonename));
if (found == nodeMap.end())
throw std::runtime_error("Can't find attachment node " + bonename);

osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, found->second);
osg::ref_ptr<osg::Node> attached = SceneUtil::attach(template, mObjectRoot, bonefilter, found->second);
if (enchantedGlow)
mGlowUpdater = SceneUtil::addEnchantedGlow(attached, mResourceSystem, *glowColor);

Expand Down