mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 05:44:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #175 from OpenMW/master

Browse source 
Add OpenMW commits up to 27 Feb 2017
This commit is contained in:
David Cernat 2017-02-27 12:09:47 +02:00 committed by GitHub
commit 48125913c3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -652,7 +652,7 @@ namespace MWPhysics
mPtr.getRefData().getBaseNode()->accept(visitor); mPtr.getRefData().getBaseNode()->accept(visitor);
if (!visitor.mFound) if (!visitor.mFound)
{ {
std::cerr << "animateCollisionShapes: Can't find node " << recIndex << std::endl; std::cerr << "animateCollisionShapes: Can't find node " << recIndex << " for " << mPtr.getCellRef().getRefId() << std::endl;
return; return;
} }
osg::NodePath nodePath = visitor.mFoundPath; osg::NodePath nodePath = visitor.mFoundPath;

3
components/nifosg/nifloader.cpp
View file

@ -528,6 +528,9 @@ namespace NifOsg
node = new osg::Group; node = new osg::Group;
dataVariance = osg::Object::STATIC; dataVariance = osg::Object::STATIC;
break; break;
case Nif::RC_NiBillboardNode:
dataVariance = osg::Object::DYNAMIC;
break;
default: default:
// The Root node can be created as a Group if no transformation is required. // The Root node can be created as a Group if no transformation is required.
// This takes advantage of the fact root nodes can't have additional controllers // This takes advantage of the fact root nodes can't have additional controllers