From c8a6c3984766514be053cc9f6dbd56b893373146 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Wed, 15 Apr 2026 08:02:45 +0200
Subject: [PATCH] Reorder and enhance brush checks in viewport host

---
 src/viewport-three/viewport-host.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index afb7c74d..e576c3eb 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -2808,14 +2808,17 @@ export class ViewportHost {
   private getComponentTargetVertexIds(
     target: ActiveTransformSession["target"]
   ): WhiteboxVertexId[] {
+    if (
+      target.kind !== "brushFace" &&
+      target.kind !== "brushEdge" &&
+      target.kind !== "brushVertex"
+    ) {
+      return [];
+    }
+
     const brush = this.currentDocument?.brushes[target.brushId];
 
-    if (
-      brush === undefined ||
-      (target.kind !== "brushFace" &&
-        target.kind !== "brushEdge" &&
-        target.kind !== "brushVertex")
-    ) {
+    if (brush === undefined) {
       return [];
     }