3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-31 23:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] init nodes uids from project file

Browse source
This commit is contained in:
Fabien Castan 2024-06-16 18:54:37 +02:00
parent 412c496804
commit 77571dca38
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/core/graph.py
View file

@ -341,8 +341,13 @@ class Graph(BaseObject):
for nodeName, nodeData in sorted(data.items(), key=lambda x: self.getNodeIndexFromName(x[0])):
node = self.node(nodeName)
savedUid = nodeData.get("uids", "").get("0", "") # Node's UID from the graph file
graphUid = node._uids.get(0) # Node's UID from the graph itself
savedUid = nodeData.get("uids", {}) # Node's UID from the graph file
# JSON enfore keys to be strings, see
# https://docs.python.org/3.8/library/json.html#json.dump
# We know our keys are integers, so we convert them back to int.
savedUid = {int(k): v for k, v in savedUid.items()}
graphUid = node._uids # Node's UID from the graph itself
if savedUid != graphUid and graphUid is not None:
# Different UIDs, remove the existing node from the graph and replace it with a CompatibilityNode
logging.debug("UID conflict detected for {}".format(nodeName))