Skip to content
Closed
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions flow360/component/simulation/framework/entity_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,14 @@ def fast_register(self, entity: EntityBase, known_frozen_hashes: set[str]) -> se
Returns:
known_frozen_hashes (set[str])
"""
<<<<<<< HEAD
if entity.entity_bucket not in self.internal_registry:
=======
if (
entity.entity_bucket
not in self.internal_registry # pylint: disable=unsupported-membership-test
):
>>>>>>> bbce6895 ([Main to 25.5 hotfix] Speed up the loading of the entities by using set and also reduce complexity with supplied known hash set #1316 (#1319))
# pylint: disable=unsupported-assignment-operation
self.internal_registry[entity.entity_bucket] = []

Expand Down