Merge remote-tracking branch 'origin/master'

apps/openmw/mwrender/animation.cpp

@@ -935,8 +935,10 @@ namespace MWRender
 
     void Animation::setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature)
     {
+        osg::ref_ptr<osg::StateSet> previousStateset;
         if (mObjectRoot)
         {
+            previousStateset = mObjectRoot->getStateSet();
             mObjectRoot->getParent(0)->removeChild(mObjectRoot);
         }
         mObjectRoot = NULL;
@@ -961,6 +963,9 @@ namespace MWRender
             mObjectRoot = newObjectRoot;
         }
 
+        if (previousStateset)
+            mObjectRoot->setStateSet(previousStateset);
+
         if (baseonly)
         {
             RemoveDrawableVisitor removeDrawableVisitor;