From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 14 Apr 2015 23:26:59 +0000 (+0200)
Subject: Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=131323c95731898e73b783d0fefbdaa2821ad1a9;p=cgue_weave.git

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

131323c95731898e73b783d0fefbdaa2821ad1a9
diff --cc Weave/Graphix/Model.h
index bd39ae6,cdf6c91..30ba248
--- a/Weave/Graphix/Model.h
+++ b/Weave/Graphix/Model.h
@@@ -18,8 -18,9 +18,9 @@@ struct aiMesh
  class Model
  {
  public:
+ 	__declspec(deprecated)
  	Model(const string& modelpath, unsigned int index=0);
 -	Model(const aiMesh* mesh);
 +	Model(const aiMesh* mesh, const aiMatrix4x4 modelmatrix);
  	Model(unsigned int numvertices, unsigned int numfaces, float *vertex, float *uvs, float *normals, unsigned int *index);
  
  	virtual ~Model();