History

fix merge issue

ZappoMan committed 13 years ago

Commit d31c3851 parent ea844631 file · +2 −2Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -387,10 +387,10 @@ void Application::paintGL() { · 386 unmodified lines
387387 _myCamera.setTightness(0.0f);
388388 _myCamera.setDistance(0.3f);
389389 glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
390− if (_myAvatar.getHead().getBlendFace().isActive()) {
390+ if (_myAvatar.getHead().getFaceModel().isActive()) {
391391 // make sure we're aligned to the blend face eyes
392392 glm::vec3 leftEyePosition, rightEyePosition;
393− if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) {
393+ if (_myAvatar.getHead().getFaceModel().getEyePositions(leftEyePosition, rightEyePosition)) {
394394 targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
395395 }
396396 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t