Merge branch 'master' into unstable

Documentation/DeveloperHelpSources/changelog.docu

@@ -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)

libs_required/ACG/GL/globjects.hh

@@ -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;}

widgets/coreWidget/CoreWidget.cc

@@ -950,7 +950,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

widgets/coreWidget/keyHandling.cc

@@ -605,6 +605,7 @@ void CoreWidget::coreKeyPressEvent  (QKeyEvent* _e){
 
       case Qt::Key_O :
         loadMenu();
+        return;
 
       case Qt::Key_S :
         saveMenu();