Merge branch 'osganimation' into osganimation

src/osgAnimation/MorphGeometry.cpp

@@ -47,7 +47,7 @@ MorphGeometry::MorphGeometry(const osg::Geometry& g) :
 
 MorphGeometry::MorphGeometry(const MorphGeometry& b, const osg::CopyOp& copyop) :
     osg::Geometry(b,copyop),
-    _morphTransformImplementation((MorphTransform*)copyop(b._morphTransformImplementation)),
+    _morphTransformImplementation(osg::clone(b._morphTransformImplementation.get(), copyop)),
     _dirty(b._dirty),
     _method(b._method),
     _morphTargets(b._morphTargets),

src/osgAnimation/RigGeometry.cpp

@@ -67,7 +67,7 @@ RigGeometry::RigGeometry()
 RigGeometry::RigGeometry(const RigGeometry& b, const osg::CopyOp& copyop) :
     osg::Geometry(b,copyop),
     _geometry(b._geometry),
-    _rigTransformImplementation((RigTransform*)copyop(b._rigTransformImplementation)),
+    _rigTransformImplementation(osg::clone(_rigTransformImplementation.get(), copyop)),
     _vertexInfluenceMap(b._vertexInfluenceMap),
     _needToComputeMatrix(b._needToComputeMatrix)
 {

src/osgAnimation/VertexInfluence.cpp

@@ -289,6 +289,7 @@ void VertexInfluenceMap::removeUnexpressedBones(Skeleton &skel) const
             ++ removed;
             OSG_INFO<<"removing useless bone: "<< bone2rm->getName() <<std::endl;
             osg::NodeList nodes;
+
             for(unsigned int numchild = 0; numchild < bone2rm->getNumChildren(); numchild++)
             {
                 if( (child = dynamic_cast<Bone*>(bone2rm->getChild(numchild))) )

src/osgText/Glyph.cpp

@@ -167,7 +167,7 @@ void GlyphTexture::addGlyph(Glyph* glyph, int posX, int posY)
 
     glyph->setTextureInfo(_shaderTechnique, info.get());
 
-    copyGlyphImage(glyph, info);
+    copyGlyphImage(glyph, info.get());
 }
 
 void GlyphTexture::copyGlyphImage(Glyph* glyph, Glyph::TextureInfo* info)

src/osgWrappers/serializers/osgAnimation/MorphGeometry.cpp

@@ -41,8 +41,8 @@ static bool writeMorphTargets( osgDB::OutputStream& os, const osgAnimation::Morp
     { return geom.get##PROP()!=0; } \
     static bool read##ORIGINAL_PROP( osgDB::InputStream& is, osgAnimation::MorphGeometry& geom ) { \
         is >> is.BEGIN_BRACKET; \
-        osg::Array* array =is.readArray(); \
-        geom.set##PROP((osg::Vec3Array*)array); \
+        osg::ref_ptr<osg::Array> array = is.readArray(); \
+        geom.set##PROP(dynamic_cast<osg::Vec3Array*>(array.get())); \
         is >> is.END_BRACKET; \
         return true; \
     } \