diff --git a/include/osgAnimation/ActionVisitor b/include/osgAnimation/ActionVisitor index 596e054c6..5d2abe680 100644 --- a/include/osgAnimation/ActionVisitor +++ b/include/osgAnimation/ActionVisitor @@ -39,7 +39,7 @@ namespace osgAnimation { public: std::vector _stackFrameAction; - std::vector > _stackTimeline; + std::vector _stackTimeline; META_ActionVisitor(osgAnimation, ActionVisitor); void traverse(Action& visitor); diff --git a/include/osgAnimation/Timeline b/include/osgAnimation/Timeline index 09ff005d3..9de360497 100644 --- a/include/osgAnimation/Timeline +++ b/include/osgAnimation/Timeline @@ -23,11 +23,10 @@ #include #include #include +#include namespace osgAnimation { - class StatsActionVisitor; - class OSGANIMATION_EXPORT Timeline : public Action //osg::Object { public: diff --git a/include/osgDB/DatabaseRevisions b/include/osgDB/DatabaseRevisions index aff452219..cfabfc076 100644 --- a/include/osgDB/DatabaseRevisions +++ b/include/osgDB/DatabaseRevisions @@ -35,6 +35,8 @@ class OSGDB_EXPORT FileList : public osg::Object FileNames& getFileNames() { return _files; } const FileNames& getFileNames() const { return _files; } + bool empty() const { return _files.empty(); } + bool containsFile(const std::string& filename) const { return _files.count(filename)!=0; } void addFile(const std::string& filename) { _files.insert(filename); } diff --git a/src/osgAnimation/ActionVisitor.cpp b/src/osgAnimation/ActionVisitor.cpp index f431be2d8..c317b00c1 100644 --- a/src/osgAnimation/ActionVisitor.cpp +++ b/src/osgAnimation/ActionVisitor.cpp @@ -35,7 +35,7 @@ osgAnimation::Timeline* osgAnimation::ActionVisitor::getCurrentTimeline() { if (_stackTimeline.empty()) return 0; - return _stackTimeline.back().get(); + return _stackTimeline.back(); } osgAnimation::UpdateActionVisitor::UpdateActionVisitor() { _frame = 0; }