Merge branch 'android' into android_bubble_fix

This commit is contained in:
Gabriel Calero 2018-03-06 19:03:53 -03:00
commit a2327ea0cf

View file

@ -2726,7 +2726,8 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
AvatarInputs::show();
auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
surfaceContext->setContextProperty("Stats", Stats::getInstance());
surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());}
surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
}
void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
PROFILE_RANGE(render, __FUNCTION__);