[prefab] Try avoiding infinite loop in find

HeapsIO · Nov 28, 2024 · dad522e · dad522e
1 parent e6d002d
commit dad522e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/hide/comp/SceneEditor.hx b/hide/comp/SceneEditor.hx
@@ -4247,7 +4247,7 @@ class SceneEditor {
 		}
 
 		if (target == sceneData) {
-			var renderProps = original.find(hrt.prefab.RenderProps, null, true);
+			var renderProps = original.find(hrt.prefab.RenderProps, null, true, false);
 			if (renderProps != null)
 				queueRebuild(target);
 		}

diff --git a/hrt/prefab/Prefab.hx b/hrt/prefab/Prefab.hx
@@ -425,7 +425,9 @@ class Prefab {
 		Find a the first prefab in the tree with the given class that matches the optionnal `filter`.
 		Returns null if no matching prefab was found
 	**/
-	public function find<T:Prefab>(?cl: Class<T>, ?filter : T -> Bool, followRefs : Bool = false ) : Null<T> {
+	public function find<T:Prefab>(?cl: Class<T>, ?filter : T -> Bool, followRefs : Bool = false, includeDisabled: Bool = true) : Null<T> {
+		if (!includeDisabled && !enabled)
+			return null;
 		var asCl = cl != null ? Std.downcast(this, cl) : cast this;
 		if (asCl != null)
 			if (filter == null || filter(asCl))

diff --git a/hrt/prefab/Reference.hx b/hrt/prefab/Reference.hx
@@ -112,12 +112,14 @@ class Reference extends Object3D {
 	}
 
 
-	override public function find<T:Prefab>(?cl: Class<T>, ?filter : T -> Bool, followRefs : Bool = false ) : Null<T> {
-		var res = super.find(cl, filter, followRefs);
+	override public function find<T:Prefab>(?cl: Class<T>, ?filter : T -> Bool, followRefs : Bool = false, includeDisabled: Bool = true) : Null<T> {
+		if (!includeDisabled && !enabled)
+			return null;
+		var res = super.find(cl, filter, followRefs, includeDisabled);
 		if (res == null && followRefs ) {
 			var p = resolveRef();
 			if( p != null )
-				return p.find(cl, filter, followRefs);
+				return p.find(cl, filter, followRefs, includeDisabled);
 		}
 		return res;
 	}