summaryrefslogtreecommitdiffstats
path: root/core/object.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-27 14:18:40 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-27 14:19:11 -0300
commit8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da (patch)
treea3e932282cdafdd13c4f02bdf21f72f9846adcbe /core/object.h
parenteb7227a20b27e91c6e2adfb1ded738f2dd7e453b (diff)
downloadredot-engine-8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da.tar.gz
Changed import workflow
-Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
Diffstat (limited to 'core/object.h')
-rw-r--r--core/object.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/object.h b/core/object.h
index 3945d1d0ba..4ed78d3226 100644
--- a/core/object.h
+++ b/core/object.h
@@ -388,6 +388,7 @@ friend void postinitialize_handler(Object*);
bool _can_translate;
#ifdef TOOLS_ENABLED
bool _edited;
+ uint32_t _edited_version;
#endif
ScriptInstance *script_instance;
RefPtr script;
@@ -589,6 +590,7 @@ public:
#ifdef TOOLS_ENABLED
void set_edited(bool p_edited);
bool is_edited() const;
+ uint32_t get_edited_version() const; //this function is used to check when something changed beyond a point, it's used mainly for generating previews
#endif
void set_script_instance(ScriptInstance *p_instance);