Merge branch 'main' of https://github.com/coppolaemilio/dialogic into main

Author: coppolaemilio

addons/dialogic/Editor/Events/styles/BackgroundMusic.tres

@@ -1,17 +1,17 @@
-[gd_resource type="StyleBoxFlat" format=2]
-
-[resource]
-content_margin_left = 0.0
-content_margin_right = 0.0
-content_margin_top = 0.0
-content_margin_bottom = 0.0
-bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 )
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color( 0.12549, 0.12549, 0.12549, 1 )
-corner_radius_top_left = 6
-corner_radius_top_right = 6
-corner_radius_bottom_right = 6
-corner_radius_bottom_left = 6
+[gd_resource type="StyleBoxFlat" format=2]
+
+[resource]
+content_margin_left = 0.0
+content_margin_right = 0.0
+content_margin_top = 0.0
+content_margin_bottom = 0.0
+bg_color = Color( 0.160784, 0.423529, 0.309804, 0.447059 )
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.12549, 0.12549, 0.12549, 1 )
+corner_radius_top_left = 6
+corner_radius_top_right = 6
+corner_radius_bottom_right = 6
+corner_radius_bottom_left = 6

addons/dialogic/Editor/MasterTree/MasterTree.gd

@@ -433,11 +433,9 @@ func _on_item_rmb_selected(position):
 func get_item_folder(item: TreeItem, root : String):
 	if not item:
 		return root
-	var current_path:String = ""
+	var current_path:String = get_item_path(item)
 	if not "Root" in item.get_metadata(0)['editor']:
 		current_path = DialogicUtil.get_parent_path(current_path)
-	else:
-		current_path = get_item_path(item)
 	if not current_path.begins_with(root):
 		return root
 	return current_path

addons/dialogic/Nodes/random_audio_stream_player.gd

@@ -79,10 +79,11 @@ func load_samples_from_folder(path):
 			dir.list_dir_begin(true)
 			var file_name = dir.get_next()
 			while file_name != "":
-				if not dir.current_is_dir():
-					var f = file_name.replace('.import', '')
-					if f.to_lower().ends_with(".wav") or f.to_lower().ends_with(".ogg"):
-						var resource = ResourceLoader.load(dir.get_current_dir() + "/" + f)
-						samples.append(resource)
+				if not dir.current_is_dir() and file_name.ends_with(".import"):
+					var resource_path = dir.get_current_dir() + "/" + file_name.replace('.import', '')
+					if resource_path.get_extension().to_lower() in ["wav", "ogg"]:
+						var resource = load(resource_path)
+						if resource != null:
+							samples.append(resource)
 				file_name = dir.get_next()
 		select_samples_from_folder = ""