Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export function FloatingActionMenu() {
duplicate.start = [duplicate.start[0] + 1, duplicate.start[1] + 1]
duplicate.end = [duplicate.end[0] + 1, duplicate.end[1] + 1]
} else if (node.type === 'roof') {
duplicateInfo.children = []
duplicate = RoofNode.parse(duplicateInfo)
} else if (node.type === 'roof-segment') {
duplicate = RoofSegmentNode.parse(duplicateInfo)
Expand All @@ -134,6 +135,12 @@ export function FloatingActionMenu() {
}
} catch (error) {
console.error('Failed to parse duplicate', error)
useScene.temporal.getState().resume()
return
}

if (!duplicate) {
useScene.temporal.getState().resume()
return
}

Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/components/editor/selection-manager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -919,13 +919,13 @@ const EditorOutlinerSync = () => {
outliner.selectedObjects.length = 0
for (const id of idsToHighlight) {
const obj = sceneRegistry.nodes.get(id)
if (obj) outliner.selectedObjects.push(obj)
if (obj?.parent) outliner.selectedObjects.push(obj)
}

outliner.hoveredObjects.length = 0
if (hoveredId) {
const obj = sceneRegistry.nodes.get(hoveredId)
if (obj) outliner.hoveredObjects.push(obj)
if (obj?.parent) outliner.hoveredObjects.push(obj)
}
}, [phase, previewSelectedIds, selection, hoveredId, outliner])

Expand Down
11 changes: 8 additions & 3 deletions packages/viewer/src/lib/merged-outline-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,14 @@ export class MergedOutlineNode extends TempNode {

private _buildCache(objects: Object3D[], cache: Set<Object3D>) {
for (const obj of objects) {
obj.traverse((child: any) => {
if (child.isMesh || child.isSprite) cache.add(child)
})
if (!obj || !obj.traverse) continue
try {
obj.traverse((child: any) => {
if (child.isMesh || child.isSprite) cache.add(child)
})
} catch {
// Skip objects that were disposed or removed from the scene graph
}
}
}
}
Expand Down