2
0
Эх сурвалжийг харах

SceneEditor: clear followref on flatten

lviguier 6 сар өмнө
parent
commit
75f384c231

+ 2 - 2
hide/comp/SceneEditor.hx

@@ -1669,7 +1669,7 @@ class SceneEditor {
 	function onSceneReady() {
 		// Load display state
 		{
-			var all = sceneData.flatten(PrefabElement, null, true);
+			var all = sceneData.flatten(PrefabElement, null);
 			var list = @:privateAccess view.getDisplayState("hideList");
 			if(list != null) {
 				var m = [for(i in (list:Array<Dynamic>)) i => true];
@@ -4495,7 +4495,7 @@ class SceneEditor {
 			if (ref != null && !ref.editMode && ref.refInstance != null) {
 
 				// only call applySceneStyle and not makeInteractive on the childs of non edit references
-				for (pp in ref.refInstance.flatten(null, null, true)) {
+				for (pp in ref.refInstance.flatten(null, null)) {
 					applySceneStyle(ref.refInstance);
 				}
 			}

+ 2 - 2
hrt/prefab/Prefab.hx

@@ -391,7 +391,7 @@ class Prefab {
 	/**
 		Returns all prefabs in the tree matching the specified class.
 	**/
-	public function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T>, followRef: Bool = false ) : Array<T> {
+	public function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T> ) : Array<T> {
 		if(arr == null)
 			arr = [];
 		if( cl == null )
@@ -402,7 +402,7 @@ class Prefab {
 				arr.push(i);
 		}
 		for(c in children)
-			c.flatten(cl, arr, followRef);
+			c.flatten(cl, arr);
 		return arr;
 	}
 

+ 3 - 3
hrt/prefab/Reference.hx

@@ -138,10 +138,10 @@ class Reference extends Object3D {
 		return res;
 	}
 
-	override public function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T>, followRef : Bool = false ) : Array<T> {
+	override public function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T>) : Array<T> {
 		arr = super.flatten(cl, arr);
-		if ((editMode || followRef) && resolveRef() != null) {
-			arr = refInstance.flatten(cl, arr, followRef);
+		if (editMode && resolveRef() != null) {
+			arr = refInstance.flatten(cl, arr);
 		}
 		return arr;
 	}

+ 1 - 1
hrt/prefab/l3d/MeshSpray.hx

@@ -370,7 +370,7 @@ class MeshSpray extends Spray {
 		cast(local3d, MeshSprayObject).redraw();
 	}
 
-	override function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T>, followRef : Bool = false ) : Array<T> {
+	override function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T> ) : Array<T> {
 		if ( !editChildren )
 			return flattenSpray(cl, arr);
 

+ 1 - 1
hrt/prefab/l3d/PrefabSpray.hx

@@ -377,7 +377,7 @@ class PrefabSpray extends Spray {
 		sceneEditor.properties.element.find("#repeatPrefab").prop("checked", CONFIG.dontRepeatItem);
 	}
 
-	override function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T>, followRef : Bool = false ) : Array<T> {
+	override function flatten<T:Prefab>( ?cl : Class<T>, ?arr: Array<T> ) : Array<T> {
 		return flattenSpray(cl, arr);
 	}