From e9bbb97acccc08ae03fde41e4cc6d2dc6722021a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 22 Jun 2015 00:03:19 -0300 Subject: Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene --- core/object.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/object.h') diff --git a/core/object.h b/core/object.h index 8d1f8ebc5a..9680af924a 100644 --- a/core/object.h +++ b/core/object.h @@ -451,6 +451,8 @@ protected: Array _get_property_list_bind() const; Array _get_method_list_bind() const; + void _clear_internal_resource_paths(const Variant &p_var); + public: //should be protected, but bug in clang++ static void initialize_type(); _FORCE_INLINE_ static void register_custom_data_to_otdb() {}; @@ -599,6 +601,9 @@ public: _FORCE_INLINE_ void set_message_translation(bool p_enable) { _can_translate=p_enable; } _FORCE_INLINE_ bool can_translate_messages() const { return _can_translate; } + + void clear_internal_resource_paths(); + Object(); virtual ~Object(); @@ -651,6 +656,8 @@ public: #endif + + }; //needed by macros -- cgit v1.2.3