1 files changed, 2 insertions, 130 deletions

diff --git a/core/resource.cpp b/core/resource.cpp
index 4b09a506ff..9b5bac5f32 100644
--- a/core/resource.cpp
+++ b/core/resource.cpp
@@ -35,119 +35,6 @@
 
 #include <stdio.h>
 
-void ResourceImportMetadata::set_editor(const String& p_editor) {
-
-	editor=p_editor;
-}
-
-String ResourceImportMetadata::get_editor() const{
-
-	return editor;
-}
-
-void ResourceImportMetadata::add_source(const String& p_path,const String& p_md5) {
-
-	Source s;
-	s.md5=p_md5;
-	s.path=p_path;
-	sources.push_back(s);
-}
-
-String ResourceImportMetadata::get_source_path(int p_idx) const{
-	ERR_FAIL_INDEX_V(p_idx,sources.size(),String());
-	return sources[p_idx].path;
-}
-String ResourceImportMetadata::get_source_md5(int p_idx) const{
-	ERR_FAIL_INDEX_V(p_idx,sources.size(),String());
-	return sources[p_idx].md5;
-}
-
-void ResourceImportMetadata::set_source_md5(int p_idx,const String& p_md5) {
-
-	ERR_FAIL_INDEX(p_idx,sources.size());
-	sources[p_idx].md5=p_md5;
-
-}
-
-void ResourceImportMetadata::remove_source(int p_idx){
-
-	ERR_FAIL_INDEX(p_idx,sources.size());
-	sources.remove(p_idx);
-
-}
-
-int ResourceImportMetadata::get_source_count() const {
-
-	return sources.size();
-}
-void ResourceImportMetadata::set_option(const String& p_key, const Variant& p_value) {
-
-	if (p_value.get_type()==Variant::NIL) {
-		options.erase(p_key);
-		return;
-	}
-
-	ERR_FAIL_COND(p_value.get_type() == Variant::OBJECT);
-	ERR_FAIL_COND(p_value.get_type() == Variant::_RID);
-
-	options[p_key]=p_value;
-
-}
-
-bool ResourceImportMetadata::has_option(const String& p_key) const {
-
-	return options.has(p_key);
-}
-
-Variant ResourceImportMetadata::get_option(const String& p_key) const {
-
-	ERR_FAIL_COND_V(!options.has(p_key),Variant());
-
-	return options[p_key];
-}
-
-void ResourceImportMetadata::get_options(List<String> *r_options) const {
-
-	for(Map<String,Variant>::Element *E=options.front();E;E=E->next()) {
-
-		r_options->push_back(E->key());
-	}
-
-}
-
-PoolStringArray ResourceImportMetadata::_get_options() const {
-
-	PoolStringArray option_names;
-	option_names.resize(options.size());
-	int i=0;
-	for(Map<String,Variant>::Element *E=options.front();E;E=E->next()) {
-
-		option_names.set(i++,E->key());
-	}
-
-	return option_names;
-}
-
-void ResourceImportMetadata::_bind_methods() {
-
-	ClassDB::bind_method(_MD("set_editor","name"),&ResourceImportMetadata::set_editor);
-	ClassDB::bind_method(_MD("get_editor"),&ResourceImportMetadata::get_editor);
-	ClassDB::bind_method(_MD("add_source","path","md5"),&ResourceImportMetadata::add_source, "");
-	ClassDB::bind_method(_MD("get_source_path","idx"),&ResourceImportMetadata::get_source_path);
-	ClassDB::bind_method(_MD("get_source_md5","idx"),&ResourceImportMetadata::get_source_md5);
-	ClassDB::bind_method(_MD("set_source_md5","idx", "md5"),&ResourceImportMetadata::set_source_md5);
-	ClassDB::bind_method(_MD("remove_source","idx"),&ResourceImportMetadata::remove_source);
-	ClassDB::bind_method(_MD("get_source_count"),&ResourceImportMetadata::get_source_count);
-	ClassDB::bind_method(_MD("set_option","key","value"),&ResourceImportMetadata::set_option);
-	ClassDB::bind_method(_MD("get_option","key"),&ResourceImportMetadata::get_option);
-	ClassDB::bind_method(_MD("get_options"),&ResourceImportMetadata::_get_options);
-}
-
-ResourceImportMetadata::ResourceImportMetadata() {
-
-
-}
-
 
 void Resource::emit_changed() {
 
@@ -381,21 +268,6 @@ void Resource::notify_change_to_owners() {
 	}
 }
 
-void Resource::set_import_metadata(const Ref<ResourceImportMetadata>& p_metadata) {
-#ifdef TOOLS_ENABLED
-	import_metadata=p_metadata;
-#endif
-}
-
-Ref<ResourceImportMetadata> Resource::get_import_metadata() const {
-
-#ifdef TOOLS_ENABLED
-	return import_metadata;
-#else
-	return Ref<ResourceImportMetadata>();
-#endif
-
-}
 
 #ifdef TOOLS_ENABLED
 
@@ -461,8 +333,6 @@ void Resource::_bind_methods() {
 	ClassDB::bind_method(_MD("set_name","name"),&Resource::set_name);
 	ClassDB::bind_method(_MD("get_name"),&Resource::get_name);
 	ClassDB::bind_method(_MD("get_rid"),&Resource::get_rid);
-	ClassDB::bind_method(_MD("set_import_metadata","metadata"),&Resource::set_import_metadata);
-	ClassDB::bind_method(_MD("get_import_metadata"),&Resource::get_import_metadata);
 	ClassDB::bind_method(_MD("set_local_to_scene","enable"),&Resource::set_local_to_scene);
 	ClassDB::bind_method(_MD("is_local_to_scene"),&Resource::is_local_to_scene);
 	ClassDB::bind_method(_MD("get_local_scene:Node"),&Resource::get_local_scene);
@@ -483,9 +353,11 @@ Resource::Resource() {
 
 #ifdef TOOLS_ENABLED
 	last_modified_time=0;
+	import_last_modified_time=0;
 #endif
 
 	subindex=0;
+	local_to_scene=false;
 	local_scene=NULL;
 }