Skip to content

Commit

Permalink
Merge pull request #90 from cryos/active-objects
Browse files Browse the repository at this point in the history
Want to push all the builds forward in the superbuild.
  • Loading branch information
cryos authored Aug 12, 2018
2 parents 2194cc1 + 79e0351 commit f9d9386
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions avogadro/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <avogadro/qtgui/sceneplugin.h>
#include <avogadro/qtgui/scenepluginmodel.h>
#include <avogadro/qtgui/toolplugin.h>
#include <avogadro/qtopengl/activeobjects.h>
#include <avogadro/qtopengl/glwidget.h>
#include <avogadro/qtplugins/pluginmanager.h>
#include <avogadro/rendering/glrenderer.h>
Expand Down Expand Up @@ -200,6 +201,7 @@ using QtGui::ScenePluginFactory;
using QtGui::ScenePluginModel;
using QtGui::ToolPlugin;
using QtGui::ToolPluginFactory;
using QtOpenGL::ActiveObjects;
using QtOpenGL::GLWidget;
using QtPlugins::PluginManager;
using std::string;
Expand Down Expand Up @@ -310,6 +312,7 @@ void MainWindow::setupInterface()
setCentralWidget(m_multiViewWidget);
GLWidget* glWidget = new GLWidget(this);
m_multiViewWidget->addWidget(glWidget);
ActiveObjects::instance().setActiveGLWidget(glWidget);

// Our tool dock.
m_toolDock = new QDockWidget(tr("Tool"), this);
Expand Down

0 comments on commit f9d9386

Please sign in to comment.