fixed merge conflict

This commit is contained in:
Jeffrey Ventrella 2013-05-08 19:25:23 -07:00
parent bbd85664d6
commit fc549b73bd

View file

@ -750,11 +750,7 @@ void displaySide(Camera& whichCamera) {
// brad's frustum for debugging
if (::frustumOn) renderViewFrustum(::viewFrustum);
//Render my own avatar
myAvatar.render(::lookingInMirror, ::myCamera.getPosition());
avatarRenderer.render(&myAvatar, ::lookingInMirror, ::myCamera.getPosition());
glPopMatrix();
}