Skip to content

Commit b1369d2

Browse files
Fix compilation issues after rebasing against master
1 parent b0c8fb8 commit b1369d2

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

editor/plugins/audio_graph_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@ void AudioGraphEditorPlugin::disconnect_nodes(int p_from_node, int p_from_port,
18051805
if (audio_graph_editor->audio_graph) {
18061806
graph->disconnect_node(itos(p_from_node), p_from_port, itos(p_to_node), p_to_port);
18071807

1808-
for (const List<AudioStreamGraph::Connection>::Element *E = connections.front(); E; E = E->next()) {
1808+
for (List<AudioStreamGraph::Connection>::Element *E = connections.front(); E;) {
18091809
if (E->get().from_node == p_from_node && E->get().from_port == p_from_port && E->get().to_node == p_to_node && E->get().to_port == p_to_port) {
18101810
connections.erase(E);
18111811
break;

editor/plugins/audio_graph_editor_plugin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ class AudioGraphEditorPlugin : public EditorPlugin {
335335
void set_connections(const List<AudioStreamGraph::Connection> &p_connections);
336336
void set_input_port_default_value(int p_node_id, int p_port_id, const Variant &p_value);
337337

338-
virtual String get_name() const override { return "AudioGraph"; }
339338
virtual void edit(Object *p_object) override;
340339
virtual bool handles(Object *p_object) const override;
341340
virtual void make_visible(bool p_visible) override;

scene/resources/audio_stream_graph.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Error AudioStreamGraph::connect_nodes(int p_from_node, int p_from_port, int p_to
105105
}
106106

107107
void AudioStreamGraph::disconnect_nodes(int p_from_node, int p_from_port, int p_to_node, int p_to_port) {
108-
for (const List<Connection>::Element *E = connections.front(); E; E = E->next()) {
108+
for (List<Connection>::Element *E = connections.front(); E;) {
109109
if (E->get().from_node == p_from_node && E->get().from_port == p_from_port && E->get().to_node == p_to_node && E->get().to_port == p_to_port) {
110110
connections.erase(E);
111111
nodes[p_from_node].next_connected_nodes.erase(p_to_node);

0 commit comments

Comments
 (0)