Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIxing build issue doh...

Browse source
This commit is contained in:
Sam Gateau 2018-11-28 22:21:58 -08:00
parent aa749b0980
commit 54fa4365b8
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -5088,13 +5088,7 @@ void Application::init() {
// Make sure Login state is up to date // Make sure Login state is up to date
#if !defined(DISABLE_QML) #if !defined(DISABLE_QML)
DependencyManager::get<DialogsManager>()->toggleLoginDialog(); DependencyManager::get<DialogsManager>()->toggleLoginDialog();
<<<<<<< HEAD
=======
#endif #endif
if (!DISABLE_DEFERRED) {
DependencyManager::get<DeferredLightingEffect>()->init();
}
>>>>>>> f4535e6784be56de3e3b0a21517280c12a434425
DependencyManager::get<AvatarManager>()->init(); DependencyManager::get<AvatarManager>()->init();
_timerStart.start(); _timerStart.start();

3
interface/src/Application_render.cpp
View file

@ -19,9 +19,6 @@
#include "Util.h" #include "Util.h"
<<<<<<< HEAD
//void Application::paintGL() { //void Application::paintGL() {
// // Some plugins process message events, allowing paintGL to be called reentrantly. // // Some plugins process message events, allowing paintGL to be called reentrantly.
// //