Merge branch 'master' of git://git.gamezock.de/c3d

Conflicts:
	Cubehole.cpp
	Cubehole.h
	DisplayClass.cpp
	Trapezocube.cpp

1 files changed, 1 insertions, 2 deletions

diff --git a/Trapezocube.cpp b/Trapezocube.cpp
index bfb82c3..8205ee6 100644
--- a/Trapezocube.cpp
+++ b/Trapezocube.cpp
@@ -1,7 +1,7 @@
 #include "Trapezocube.h"
 
 
-std::list<Triangle> Trapezocube::getTriangles(/*const Matrix &modelview*/)
+std::list<Triangle> Trapezocube::getTriangles()
 {
   std::list<Triangle> triangles;
   // width, height, depth
@@ -75,7 +75,6 @@ std::list<Triangle> Trapezocube::getTriangles(/*const Matrix &modelview*/)
 
   for(std::list<Triangle>::iterator t = triangles.begin(); t != triangles.end(); ++t) {
     t->transform(rotation);
-    //t->transform(modelview);
   }
 
   return triangles;