History

fixed merge conflict

Jeffrey Ventrella committed 13 years ago

Commit fc549b71 parent bbd85661 file · +1 −5Browse files

Showing the changes to interface/src/main.cpp (1 of 1 file). Show all

Unified · Split

interface/src/main.cpp+1−5
@@ -750,11 +750,7 @@ void displaySide(Camera& whichCamera) { · 749 unmodified lines
750 750
751 // brad's frustum for debugging751 // brad's frustum for debugging
752 if (::frustumOn) renderViewFrustum(::viewFrustum);752 if (::frustumOn) renderViewFrustum(::viewFrustum);
753 753
754 //Render my own avatar
755 myAvatar.render(::lookingInMirror, ::myCamera.getPosition());
756 avatarRenderer.render(&myAvatar, ::lookingInMirror, ::myCamera.getPosition());
757
758 glPopMatrix();754 glPopMatrix();
759}755}
760 756