diff options
Diffstat (limited to 'editor/editor_data.cpp')
| -rw-r--r-- | editor/editor_data.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 1cafd1d1f4..0b43fd5ac0 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -314,7 +314,7 @@ void EditorData::copy_object_params(Object *p_object) { for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { - if (!(E->get().usage & PROPERTY_USAGE_EDITOR)) + if (!(E->get().usage & PROPERTY_USAGE_EDITOR) || E->get().name == "script" || E->get().name == "scripts") continue; PropertyData pd; @@ -727,7 +727,7 @@ uint64_t EditorData::get_edited_scene_version() const { return edited_scene[current_edited_scene].version; } uint64_t EditorData::get_scene_version(int p_idx) const { - ERR_FAIL_INDEX_V(p_idx, edited_scene.size(), false); + ERR_FAIL_INDEX_V(p_idx, edited_scene.size(), 0); return edited_scene[p_idx].version; } |