diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-21 01:06:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 01:06:21 +0200 |
| commit | 8adf04804550957f43c810b13fcce66dd76e5fd8 (patch) | |
| tree | 2ee58365f1092587277770ceaedfc1e35454acfd /editor/import/collada.cpp | |
| parent | f4126cc902b0cbb100bcf1b37ee15df5a8430d21 (diff) | |
| parent | 45af29da8095af16729955117a165d23e77cd740 (diff) | |
Merge pull request #61194 from reduz/new-hash-set
Add a new HashSet template
Diffstat (limited to 'editor/import/collada.cpp')
| -rw-r--r-- | editor/import/collada.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/import/collada.cpp b/editor/import/collada.cpp index 71b5ddc216..f4d19fe8b6 100644 --- a/editor/import/collada.cpp +++ b/editor/import/collada.cpp @@ -2029,7 +2029,7 @@ void Collada::_merge_skeletons(VisualScene *p_vscene, Node *p_node) { NodeGeometry *gnode = static_cast<NodeGeometry *>(p_node); if (gnode->controller) { // recount skeletons used - RBSet<NodeSkeleton *> skeletons; + HashSet<NodeSkeleton *> skeletons; for (int i = 0; i < gnode->skeletons.size(); i++) { String nodeid = gnode->skeletons[i]; @@ -2049,11 +2049,11 @@ void Collada::_merge_skeletons(VisualScene *p_vscene, Node *p_node) { if (skeletons.size() > 1) { //do the merger!! - RBSet<NodeSkeleton *>::Element *E = skeletons.front(); - NodeSkeleton *base = E->get(); + HashSet<NodeSkeleton *>::Iterator E = skeletons.begin(); + NodeSkeleton *base = *E; - for (E = E->next(); E; E = E->next()) { - NodeSkeleton *merged = E->get(); + for (++E; E; ++E) { + NodeSkeleton *merged = *E; _remove_node(p_vscene, merged); for (int i = 0; i < merged->children.size(); i++) { _joint_set_owner(merged->children[i], base); |