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

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

1 files changed, 1 insertions, 0 deletions

diff --git a/Triangle.h b/Triangle.h
index dc48071..febcb3d 100644
--- a/Triangle.h
+++ b/Triangle.h
@@ -24,6 +24,7 @@ class Triangle
     }
 
     void render() const {
+      glColor4fv(c.array);
       glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, c.array);
       glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (c/2).array);