From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 28 Jun 2016 04:31:04 +0000 (+0200)
Subject: Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=5963dbb167a871cc7bbfa14f8a5822e0eb01b9b0;p=cgue_weave.git

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

5963dbb167a871cc7bbfa14f8a5822e0eb01b9b0
diff --cc Weave/Scene/Boar.h
index 82e2055,70058e7..06a4d04
--- a/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;