Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jeffrey Ventrella 2013-04-18 14:54:08 -07:00
commit 2b5d23de5d

View file

@ -832,8 +832,6 @@ void display(void)
if (agent->getLinkedData() != NULL) {
Head *agentHead = (Head *)agent->getLinkedData();
glPushMatrix();
glm::vec3 pos = agentHead->getBodyPosition();
glTranslatef(pos.x, pos.y, pos.z);
agentHead->render(0);
glPopMatrix();
}