Skip to content

Commit

Permalink
Merge branch 'master' into clean_cmake_depr
Browse files Browse the repository at this point in the history
  • Loading branch information
hugtalbot authored Jul 5, 2024
2 parents c67a6ea + 1ea237b commit 7d58a0e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion Sofa/GUI/Qt/src/sofa/gui/qt/GUI.ui
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,6 @@ State 2: dirty, in that state the button reflect the fact that the scene graph v
<slot>popupOpenFileSelector()</slot>
<slot>fileReload()</slot>
<slot>fileSave()</slot>
<slot>fileSaveAs()</slot>
<slot>fileExit()</slot>
<slot>editRecordDirectory()</slot>
<slot>showPluginManager()</slot>
Expand Down
1 change: 0 additions & 1 deletion Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,6 @@ void RealGUI::createSimulationGraph()
connect(simulationGraph, SIGNAL( RootNodeChanged(sofa::simulation::Node*, const char*) ), this, SLOT ( newRootNode(sofa::simulation::Node* , const char*) ) );
connect(simulationGraph, SIGNAL( NodeRemoved() ), this, SLOT( update() ) );
connect(simulationGraph, SIGNAL( Lock(bool) ), this, SLOT( lockAnimation(bool) ) );
connect(simulationGraph, SIGNAL( RequestSaving(sofa::simulation::Node*) ), this, SLOT( fileSaveAs(sofa::simulation::Node*) ) );
connect(simulationGraph, SIGNAL( RequestExportOBJ(sofa::simulation::Node*, bool) ), this, SLOT( exportOBJ(sofa::simulation::Node*, bool) ) );
connect(simulationGraph, SIGNAL( RequestActivation(sofa::simulation::Node*, bool) ), this, SLOT( activateNode(sofa::simulation::Node*, bool) ) );
connect(simulationGraph, SIGNAL( RequestSleeping(sofa::simulation::Node*, bool) ), this, SLOT( setSleepingNode(sofa::simulation::Node*, bool) ) );
Expand Down

0 comments on commit 7d58a0e

Please sign in to comment.