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

diff --cc Weave/Graphix/Model.h
index bd39ae6137f1e146b033052773d65c3014cec78e,cdf6c91d351c6d3d6882e7d90a1da1e0d53d9aa9..30ba2488f0a5bbe460400065f48d26a9f20ce5b6
--- 1/Weave/Graphix/Model.h
--- 2/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();