oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restrict backwards compat option to old projects only

Browse Source
This commit is contained in:
itsmattkc
2021-10-08 12:58:39 -07:00
parent 469e0525ba
commit fc83e439cc
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/xmlutils.cpp
+9 -5
View File
@@ -27,7 +27,7 @@
namespace olive {
void XMLConnectNodes(const XMLNodeData &xml_node_data, MultiUndoCommand *command)
void XMLConnectNodes(const XMLNodeData &xml_node_data, uint version, MultiUndoCommand *command)
{
foreach (const XMLNodeData::SerializedConnection& con, xml_node_data.desired_connections) {
Node *out = xml_node_data.node_ptrs.value(con.output_node);
@@ -39,13 +39,17 @@ void XMLConnectNodes(const XMLNodeData &xml_node_data, MultiUndoCommand *command
if (command) {
command->add_child(new NodeEdgeAddCommand(out, con.input));
/// Deprecated: backwards compatibility only
command->add_child(new NodeSetValueHintCommand(con.input, hint));
if (version < 210907) {
/// Deprecated: backwards compatibility only
command->add_child(new NodeSetValueHintCommand(con.input, hint));
}
} else {
Node::ConnectEdge(out, con.input);
/// Deprecated: backwards compatibility only
con.input.node()->SetValueHintForInput(con.input.input(), hint, con.input.element());
if (version < 210907) {
/// Deprecated: backwards compatibility only
con.input.node()->SetValueHintForInput(con.input.input(), hint, con.input.element());
}
}
}
}
app/common/xmlutils.h
+1 -1
View File
@@ -55,7 +55,7 @@ struct XMLNodeData {
};
void XMLConnectNodes(const XMLNodeData& xml_node_data, MultiUndoCommand *command = nullptr);
void XMLConnectNodes(const XMLNodeData& xml_node_data, uint version, MultiUndoCommand *command = nullptr);
/**
* @brief Workaround for QXmlStreamReader::readNextStartElement not detecting the end of a document
app/node/nodecopypaste.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ QVector<Node *> NodeCopyPasteService::PasteNodesFromClipboard(NodeGraph *graph,
// Make connections
if (!xml_node_data.desired_connections.isEmpty()) {
XMLConnectNodes(xml_node_data, command);
XMLConnectNodes(xml_node_data, data_version, command);
}
// Link blocks
app/node/project/project.cpp
+1 -1
View File
@@ -196,7 +196,7 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, uint
}
// Make connections
XMLConnectNodes(xml_node_data);
XMLConnectNodes(xml_node_data, version);
// Link blocks
XMLLinkBlocks(xml_node_data);