From 5f7762d0cafd32e39511e567131922e470bb800f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=98=81=EB=AF=BC?=
 <117150306+jym04@users.noreply.github.com>
Date: Tue, 24 Jun 2025 11:25:36 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=A7=80=EB=AA=A8=20=EC=97=85?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=EA=B0=80=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8,=20=EB=B0=B0=EC=B9=98=EB=90=9C?=
 =?UTF-8?q?=20=EC=97=90=EC=85=8B=20=EB=B3=B5=EC=82=AC=20=EC=8B=9C=20Hierar?=
 =?UTF-8?q?chy=20=EC=97=90=20=EC=B6=94=EA=B0=80=20=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/Studio/Command/CreateConnectedAssetCommand.cs  | 7 ++++++-
 Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs  | 3 +++
 Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs
index 7c31d38c..017c7893 100644
--- a/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs
+++ b/Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs
@@ -1,6 +1,7 @@
 using Studio.AssetTool;
 using Studio.Manage;
-using Studio;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace Studio.Command
 {
@@ -41,6 +42,10 @@ namespace Studio.Command
             connectedAsset.renderObject.gameObject.SetActive(false);
             connector.componentScrollView.RemoveItem(connectedAsset.hierarchyItem);
             connector.sceneDataContainer.sceneObjects.Remove(connectedAsset.renderObject);
+
+            var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
+            renderObjectHandler.rtgController.SetGizmoTargetObjects(new List<GameObject>());
+
         }
     }
 
diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs
index f0464f32..1682da6c 100644
--- a/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs
+++ b/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs
@@ -174,6 +174,9 @@ namespace Studio.UI
             {
                 ChangeTransformValue(gb.transform, type, value);
             }
+            var renderObjectHandler = ManagerHub.instance.Get<RenderObjectHandler>();
+            renderObjectHandler.ResetGizmoTargetObjects();
+
             onTransformChanged?.Invoke(selectedObjects);
         }
         public void OnTransformChanged(List<GameObject> objectTransforms)
diff --git a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs
index a51b26d7..c7596585 100644
--- a/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs
+++ b/Assets/Scripts/Studio/UI/TreeView/HierarchyScrollItemUI.cs
@@ -90,7 +90,7 @@ namespace Studio.HierarchyTree
         private void SetName()
         {
             nameText.text = currentItem.name;
-            CustomAssetRenderObject connectObj = currentItem.linkedObject.GetComponent<CustomAssetRenderObject>();
+            CustomAssetRenderObject connectObj = currentItem.linkedObject?.GetComponent<CustomAssetRenderObject>();
             if (connectObj != null && !string.IsNullOrEmpty(connectObj.code))
             {
                 nameText.text += $" ({connectObj.code})";
-- 
2.48.1.windows.1