mirror of
https://github.com/overte-org/overte.git
synced 2025-08-05 03:38:28 +02:00
fixed merge conflict
This commit is contained in:
parent
bbd85664d6
commit
fc549b73bd
1 changed files with 1 additions and 5 deletions
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue