Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

diff --cc Weave/Scene/Boar.cpp
Simple merge

diff --cc Weave/Scene/Boar.h
index 82e2055048fe4801c2b833a765c36530dafa8606,70058e79e22522430767743bbf527c5a3eaadc40..06a4d046ba14f1de7d2add74881500ff15140ed1
--- 1/Weave/Scene/Boar.h
--- 2/Weave/Scene/Boar.h
+++ b/Weave/Scene/Boar.h
@@@ -11,9 -11,10 +11,10 @@@ public
        ~Boar();
  
        virtual void update(float) override;
 -      //virtual void draw(drawTarget target = DRAW_Model) const override;
 +      virtual void draw(drawTarget target = DRAW_Model) const override;
  
        virtual void collides(SceneObject* other, btPersistentManifold* contactManifold, float deltaT = 1.f) override;
+       void revive();
  
  protected:
        bool activated = false;