Browse Source

fixed bug where resource path is properly exported

Juan Linietsky 11 years ago
parent
commit
ff5a815523
2 changed files with 17 additions and 2 deletions
  1. 14 2
      core/resource.cpp
  2. 3 0
      core/resource.h

+ 14 - 2
core/resource.cpp

@@ -245,11 +245,23 @@ Ref<Resource> Resource::duplicate(bool p_subresources) {
 }
 
 
+void Resource::_set_path(const String& p_path) {
+
+	set_path(p_path,false);
+}
+
+void Resource::_take_over_path(const String& p_path) {
+
+	set_path(p_path,true);
+}
+
+
 void Resource::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("set_path","path"),&Resource::set_path);
+	ObjectTypeDB::bind_method(_MD("set_path","path"),&Resource::_set_path);
+	ObjectTypeDB::bind_method(_MD("take_over_path","path"),&Resource::_take_over_path);
 	ObjectTypeDB::bind_method(_MD("get_path"),&Resource::get_path);
-	ObjectTypeDB::bind_method(_MD("set_name","name","take_over"),&Resource::set_name,DEFVAL(false));
+	ObjectTypeDB::bind_method(_MD("set_name","name"),&Resource::set_name);
 	ObjectTypeDB::bind_method(_MD("get_name"),&Resource::get_name);
 	ObjectTypeDB::bind_method(_MD("get_rid"),&Resource::get_rid);
 	ObjectTypeDB::bind_method(_MD("set_import_metadata","metadata"),&Resource::set_import_metadata);

+ 3 - 0
core/resource.h

@@ -115,6 +115,9 @@ protected:
 
 	virtual void _resource_path_changed();
 	static void _bind_methods();
+
+	void _set_path(const String& p_path);
+	void _take_over_path(const String& p_path);
 public:
 	
 	virtual bool can_reload_from_file();