diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 10 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 2 | ||||
| -rw-r--r-- | core/object.h | 1 | ||||
| -rw-r--r-- | core/undo_redo.cpp | 5 |
4 files changed, 18 insertions, 0 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index c66416ea6d..513c7a9470 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -597,7 +597,15 @@ void _OS::native_video_stop() { OS::get_singleton()->native_video_stop(); }; +bool _OS::is_debug_build() const { +#ifdef DEBUG_ENABLED + return true; +#else + return false; +#endif + +} String _OS::get_custom_level() const { return OS::get_singleton()->get_custom_level(); @@ -668,6 +676,8 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("can_use_threads"),&_OS::can_use_threads); + ObjectTypeDB::bind_method(_MD("is_debug_build"),&_OS::is_debug_build); + //ObjectTypeDB::bind_method(_MD("get_mouse_button_state"),&_OS::get_mouse_button_state); ObjectTypeDB::bind_method(_MD("dump_memory_to_file","file"),&_OS::dump_memory_to_file); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 2d824955df..b3040a96ca 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -154,6 +154,8 @@ public: bool has_touchscreen_ui_hint() const; + bool is_debug_build() const; + String get_unique_ID() const; /* diff --git a/core/object.h b/core/object.h index 8e0164b13b..7ce07869a6 100644 --- a/core/object.h +++ b/core/object.h @@ -81,6 +81,7 @@ enum PropertyUsageFlags { PROPERTY_USAGE_BUNDLE=128, //used for optimized bundles PROPERTY_USAGE_CATEGORY=256, PROPERTY_USAGE_STORE_IF_NONZERO=512, //only store if nonzero + PROPERTY_USAGE_NO_INSTANCE_STATE=1024, PROPERTY_USAGE_DEFAULT=PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_NETWORK, PROPERTY_USAGE_DEFAULT_INTL=PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_NETWORK|PROPERTY_USAGE_INTERNATIONALIZED, diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index b78fd89883..2c4d9e16a8 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -243,6 +243,11 @@ void UndoRedo::_process_operation_list(List<Operation>::Element *E) { case Operation::TYPE_PROPERTY: { obj->set(op.name,op.args[0]); +#ifdef TOOLS_ENABLED + Resource* res = obj->cast_to<Resource>(); + if (res) + res->set_edited(true); +#endif } break; case Operation::TYPE_REFERENCE: { //do nothing |