Merge branch 'master' of https://github.com/AxioDL/PrimeWorldEditor
This commit is contained in:
commit
bcfcab1247
|
@ -81,6 +81,12 @@ public:
|
||||||
/** Main function */
|
/** Main function */
|
||||||
int Main(int argc, char *argv[])
|
int Main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
// Default OpenGL format
|
||||||
|
QSurfaceFormat glFormat;
|
||||||
|
glFormat.setVersion(3, 3);
|
||||||
|
glFormat.setProfile(QSurfaceFormat::CoreProfile);
|
||||||
|
QSurfaceFormat::setDefaultFormat(glFormat);
|
||||||
|
|
||||||
// Create application
|
// Create application
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
|
||||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
|
@ -107,12 +113,6 @@ public:
|
||||||
qApp->installNativeEventFilter(gpMouseDragCocoaEventFilter);
|
qApp->installNativeEventFilter(gpMouseDragCocoaEventFilter);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Default OpenGL format
|
|
||||||
QSurfaceFormat glFormat;
|
|
||||||
glFormat.setVersion(3, 3);
|
|
||||||
glFormat.setProfile(QSurfaceFormat::CoreProfile);
|
|
||||||
QSurfaceFormat::setDefaultFormat(glFormat);
|
|
||||||
|
|
||||||
// Init log
|
// Init log
|
||||||
bool Initialized = NLog::InitLog(LocateLogPath());
|
bool Initialized = NLog::InitLog(LocateLogPath());
|
||||||
if (!Initialized) UICommon::ErrorMsg(0, "Couldn't open log file. Logging will not work for this session.");
|
if (!Initialized) UICommon::ErrorMsg(0, "Couldn't open log file. Logging will not work for this session.");
|
||||||
|
|
Loading…
Reference in New Issue