Skip to content

Editor: Animation state machine editor crashed #860 #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Oct 28, 2024
Merged

Editor: Animation state machine editor crashed #860 #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/editor/grapheditor/editor/graph/abstractnodegraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ void AbstractNodeGraph::load(const QString &path) {
save(path);
}
}

emit graphLoaded();
}

void AbstractNodeGraph::save(const QString &path) {
Expand Down
1 change: 1 addition & 0 deletions modules/editor/grapheditor/editor/graph/abstractnodegraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class NODEGRAPH_EXPORT AbstractNodeGraph : public QObject {

signals:
void graphUpdated();
void graphLoaded();

void messageReported(int node, const QString &text);

Expand Down
6 changes: 6 additions & 0 deletions modules/editor/grapheditor/editor/graph/graphcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ AbstractNodeGraph *GraphController::graph() {
void GraphController::setGraph(AbstractNodeGraph *graph) {
m_graph = graph;

m_focusedWidget = nullptr;
m_drag = false;

m_selectedItems.clear();
m_softSelectedItems.clear();

if(m_graph->rootNode()) {
setSelected({ m_graph->rootNode() });
emit m_view->itemsSelected(m_selectedItems);
Expand Down
6 changes: 6 additions & 0 deletions modules/editor/grapheditor/editor/graph/graphview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ void GraphView::setGraph(AbstractNodeGraph *graph) {
static_cast<GraphController *>(m_controller)->setGraph(graph);

connect(graph, &AbstractNodeGraph::graphUpdated, this, &GraphView::onGraphUpdated);
connect(graph, &AbstractNodeGraph::graphLoaded, this, &GraphView::onGraphLoaded);

// Create menu
for(auto &it : graph->nodeList()) {
Expand Down Expand Up @@ -325,6 +326,11 @@ void GraphView::onGraphUpdated() {
composeLinks();
}

void GraphView::onGraphLoaded() {
GraphController *ctrl = static_cast<GraphController *>(m_controller);
ctrl->setGraph(ctrl->graph());
}

void GraphView::reselect() {
auto list = static_cast<GraphController *>(m_controller)->selectedItems();
emit itemsSelected(list);
Expand Down
2 changes: 2 additions & 0 deletions modules/editor/grapheditor/editor/graph/graphview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ private slots:

void onGraphUpdated();

void onGraphLoaded();

void onDraw() override;

protected:
Expand Down