Merge pull request #173 from OpenMW/master

Add OpenMW commits up to 26 Feb 2017

components/resource/scenemanager.cpp

@@ -388,6 +388,9 @@ namespace Resource
                                          "Bip01 L Hand", "Bip01 R Hand", "Bip01 Head", "Bip01 Spine1", "Bip01 Spine2", "Bip01 L Clavicle", "Bip01 R Clavicle", "bip01", "Root Bone", "Bip01 Neck",
                                          "BoneOffset", "AttachLight", "ArrowBone", "Camera"};
                 reservedNames = std::set<std::string, Misc::StringUtils::CiComp>(reserved, reserved + sizeof(reserved)/sizeof(reserved[0]));
+
+                for (unsigned int i=0; i<sizeof(reserved)/sizeof(reserved[0]); ++i)
+                    reservedNames.insert(std::string("Tri ") + reserved[i]);
             }
             return reservedNames.find(name) != reservedNames.end();
         }

components/sceneutil/clone.cpp

@@ -38,7 +38,7 @@ namespace SceneUtil
             return operator()(processor);
         if (const osgParticle::ParticleSystemUpdater* updater = dynamic_cast<const osgParticle::ParticleSystemUpdater*>(node))
         {
-            osgParticle::ParticleSystemUpdater* cloned = osg::clone(updater, *this);
+            osgParticle::ParticleSystemUpdater* cloned = new osgParticle::ParticleSystemUpdater(*updater, osg::CopyOp::SHALLOW_COPY);
             mMap2[cloned] = updater->getParticleSystem(0);
             return cloned;
         }
@@ -94,7 +94,7 @@ namespace SceneUtil
 
     osgParticle::ParticleProcessor* CopyOp::operator() (const osgParticle::ParticleProcessor* processor) const
     {
-        osgParticle::ParticleProcessor* cloned = osg::clone(processor, *this);
+        osgParticle::ParticleProcessor* cloned = osg::clone(processor, osg::CopyOp::SHALLOW_COPY);
         mMap[cloned] = processor->getParticleSystem();
         return cloned;
     }

components/sceneutil/optimizer.cpp

@@ -847,10 +847,11 @@ void Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes()
                 pitr!=parents.end();
                 ++pitr)
             {
+                unsigned int childIndex = (*pitr)->getChildIndex(group);
                 for (unsigned int i=0; i<group->getNumChildren(); ++i)
                 {
                     osg::Node* child = group->getChild(i);
-                    (*pitr)->addChild(child);
+                    (*pitr)->insertChild(childIndex++, child);
                 }
 
                 (*pitr)->removeChild(group);