1 files changed, 26 insertions, 3 deletions

diff --git a/scene/resources/sample_library.cpp b/scene/resources/sample_library.cpp
index 5b70ee0e11..67481f267d 100644
--- a/scene/resources/sample_library.cpp
+++ b/scene/resources/sample_library.cpp
@@ -106,9 +106,9 @@ void SampleLibrary::remove_sample(const StringName& p_name) {
 	sample_map.erase(p_name);
 }
 
-void SampleLibrary::get_sample_list(List<StringName> *p_samples) {
+void SampleLibrary::get_sample_list(List<StringName> *p_samples) const {
 
-	for(Map<StringName,SampleData >::Element *E=sample_map.front();E;E=E->next()) {
+	for(const Map<StringName,SampleData >::Element *E=sample_map.front();E;E=E->next()) {
 
 		p_samples->push_back(E->key());
 	}
@@ -122,9 +122,17 @@ bool SampleLibrary::has_sample(const StringName& p_name) const {
 
 void SampleLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 
+
+	List<PropertyInfo> tpl;
 	for(Map<StringName,SampleData>::Element *E=sample_map.front();E;E=E->next()) {
 
-		p_list->push_back( PropertyInfo( Variant::DICTIONARY, "samples/"+E->key(),PROPERTY_HINT_RESOURCE_TYPE,"Sample",PROPERTY_USAGE_NOEDITOR ) );
+		tpl.push_back( PropertyInfo( Variant::DICTIONARY, "samples/"+E->key(),PROPERTY_HINT_RESOURCE_TYPE,"Sample",PROPERTY_USAGE_NOEDITOR ) );
+	}
+
+	tpl.sort();
+	//sort so order is kept
+	for(List<PropertyInfo>::Element *E=tpl.front();E;E=E->next()) {
+		p_list->push_back(E->get());
 	}
 }
 
@@ -169,7 +177,20 @@ float SampleLibrary::sample_get_pitch_scale(const StringName& p_name) const{
 	return sample_map[p_name].pitch_scale;
 }
 
+Array SampleLibrary::_get_sample_list() const {
 
+	List<StringName> snames;
+	get_sample_list(&snames);
+
+	snames.sort_custom<StringName::AlphCompare>();
+
+	Array ret;
+	for (List<StringName>::Element *E=snames.front();E;E=E->next()) {
+		ret.push_back(E->get());
+	}
+
+	return ret;
+}
 
 void SampleLibrary::_bind_methods() {
 
@@ -178,6 +199,8 @@ void SampleLibrary::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("has_sample","name"),&SampleLibrary::has_sample );
 	ObjectTypeDB::bind_method(_MD("remove_sample","name"),&SampleLibrary::remove_sample );
 
+	ObjectTypeDB::bind_method(_MD("get_sample_list"),&SampleLibrary::_get_sample_list );
+
 	ObjectTypeDB::bind_method(_MD("sample_set_volume_db","name","db"),&SampleLibrary::sample_set_volume_db );
 	ObjectTypeDB::bind_method(_MD("sample_get_volume_db","name"),&SampleLibrary::sample_get_volume_db );