From ff5a815523b3bb69674f7d678e9d03278ed5ec30 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 30 Jun 2014 01:28:05 -0300 Subject: fixed bug where resource path is properly exported --- core/resource.cpp | 16 ++++++++++++++-- core/resource.h | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/core/resource.cpp b/core/resource.cpp index ccfeaa6bb9..987bd772b0 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -245,11 +245,23 @@ Ref 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); diff --git a/core/resource.h b/core/resource.h index 2e336e1caf..8a637e7996 100644 --- a/core/resource.h +++ b/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(); -- cgit v1.2.3