History

merge from upstream

Seth Alves committed 10 years ago

Commit 0595ef02 parents b8d800f 82d671821 files · +243 −122Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -2860,6 +2860,8 @@ void Application::update(float deltaTime) { · 2859 unmodified lines
2860 }2860 }
2861 }2861 }
2862 2862
2863 _controllerScriptingInterface->updateInputControllers();
2864
2863 // Transfer the user inputs to the driveKeys2865 // Transfer the user inputs to the driveKeys
2864 // FIXME can we drop drive keys and just have the avatar read the action states directly?2866 // FIXME can we drop drive keys and just have the avatar read the action states directly?
2865 myAvatar->clearDriveKeys();2867 myAvatar->clearDriveKeys();