Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 0 deletions

diff --git a/core/resource.h b/core/resource.h
index cf7ffcbd2c..9d9c445e1d 100644
--- a/core/resource.h
+++ b/core/resource.h
@@ -99,6 +99,7 @@ friend class ResourceCache;
 	
 	String name;
 	String path_cache;
+	int subindex;
 
 	virtual bool _use_builtin_script() const { return true; }
 
@@ -132,6 +133,9 @@ public:
 	void set_path(const String& p_path,bool p_take_over=false);
 	String get_path() const;
 
+	void set_subindex(int p_sub_index);
+	int get_subindex() const;
+
 	Ref<Resource> duplicate(bool p_subresources=false);
 
 	void set_import_metadata(const Ref<ResourceImportMetadata>& p_metadata);