X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fblob_exhibit.cc;h=cd29e9629e4d1ac277473f05003834bf620538ba;hp=c92ac7acf3c80e7acb802fe1d9eeb8f58f8d0dac;hb=37b68f014b46922b885c6344d6b069cba3c9c3c5;hpb=fa954e4716d12939552b592f46a4e08405ecfb24

diff --git a/src/blob_exhibit.cc b/src/blob_exhibit.cc
index c92ac7a..cd29e96 100644
--- a/src/blob_exhibit.cc
+++ b/src/blob_exhibit.cc
@@ -140,6 +140,12 @@ void BlobExhibit::draw() const
 	glEnable(GL_TEXTURE_GEN_S);
 	glEnable(GL_TEXTURE_GEN_T);
 
+	if(node) {
+		glMatrixMode(GL_MODELVIEW);
+		glPushMatrix();
+		glMultMatrixf(node->get_matrix()[0]);
+	}
+
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glScalef(1, -1, 1);
@@ -183,13 +189,16 @@ void BlobExhibit::draw() const
 
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);
+	if(node) {
+		glPopMatrix();
+	}
 
 	glPopAttrib();
 }
 
 const AABox &BlobExhibit::get_aabox() const
 {
-	Box box = Box(priv->vol, node->get_matrix());
+	Box box = Box(priv->vol, node ? node->get_matrix() : Mat4::identity);
 	calc_bounding_aabox(&aabb, &box);
 	return aabb;
 }