Commit 092c0d3a authored by Martin Schultz's avatar Martin Schultz
Browse files

Merge branch 'unstable' into featureCoreProfile

parents c642f9f9 0bd46583
......@@ -98,6 +98,18 @@
//== IMPLEMENTATION ==========================================================
namespace {
void recreateContext()
{
QOpenGLContext* ctx = QOpenGLContext::currentContext();
QSurfaceFormat format = QSurfaceFormat::defaultFormat();
ctx->setFormat(format);
ctx->create();
QOffscreenSurface* surface = new QOffscreenSurface();
ctx->makeCurrent(surface);
}
}
/** \brief Constuctor for the Core Widget ( This is stage 1 , call init for stage 2)
*
* Initialization is working the following way:\n
......@@ -653,6 +665,7 @@ Core::init() {
coreWidget_->splitter_->restoreState (windowStates.value("Core/LogSplitter").toByteArray ());
coreWidget_->show();
recreateContext();
applyOptions();
......@@ -671,6 +684,8 @@ Core::init() {
} else {
coreWidget_->show();
recreateContext();
applyOptions();
}
......
......@@ -9,6 +9,8 @@
- Queued cross plugin interconnection feature
- Use QOpenGLWidget
- Switched to Qt command line parsing and removed SimpleOpt
- Fix clang warning by avoiding GNU extension
- Do not automatically save file immediately after loading with ctrl-o
- <b>ACG</b>
- Clamp shininess in Materialnode (caused GL Errors)
- Better Material support in Materialnode (emissive and refractive materials)
......
......@@ -125,6 +125,12 @@ void connect_console()
if (check) {
std::cerr << "Error reopening stderr" << std::endl;
}
std::cout.clear();
std::cerr.clear();
std::cin.clear();
std::wcout.clear();
std::wcerr.clear();
std::wcin.clear();
}
void attachConsole()
......
......@@ -151,7 +151,7 @@ public:
char* offset(unsigned int _offset) const
{
return ((char*)NULL + _offset);
return reinterpret_cast<char*>(_offset);
}
GLuint id() const {return vbo;}
......
......@@ -956,7 +956,11 @@ CoreWidget::updateRecent()
}
}
// Workaround for QMenu issue on MacOS: https://bugreports.qt.io/browse/QTBUG-63848
// Without this, the recent files menu entries are all disabled after using the menu once:
// https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/issues/139
recentFilesMenu_->setEnabled(false);
recentFilesMenu_->setEnabled(true);
}
void
......
......@@ -605,6 +605,7 @@ void CoreWidget::coreKeyPressEvent (QKeyEvent* _e){
case Qt::Key_O :
loadMenu();
return;
case Qt::Key_S :
saveMenu();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment