You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
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
This commit is contained in:
@@ -1756,6 +1756,7 @@ bool Object::is_queued_for_deletion() const {
|
||||
void Object::set_edited(bool p_edited) {
|
||||
|
||||
_edited=p_edited;
|
||||
_edited_version++;
|
||||
}
|
||||
|
||||
bool Object::is_edited() const {
|
||||
@@ -1763,6 +1764,11 @@ bool Object::is_edited() const {
|
||||
return _edited;
|
||||
|
||||
}
|
||||
|
||||
uint32_t Object::get_edited_version() const {
|
||||
|
||||
return _edited_version;
|
||||
}
|
||||
#endif
|
||||
|
||||
Object::Object() {
|
||||
@@ -1778,6 +1784,7 @@ Object::Object() {
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
||||
_edited=false;
|
||||
_edited_version=0;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
|
||||
Reference in New Issue
Block a user