diff options
Diffstat (limited to 'editor/editor_data.cpp')
| -rw-r--r-- | editor/editor_data.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index e788fe2c13..cb74a7b852 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ @@ -75,7 +75,7 @@ void EditorHistory::_add_object(ObjectID p_object, const String &p_property, int Object *obj = ObjectDB::get_instance(p_object); ERR_FAIL_COND(!obj); - Reference *r = obj->cast_to<Reference>(); + Reference *r = Object::cast_to<Reference>(obj); Obj o; if (r) o.ref = REF(r); @@ -633,13 +633,13 @@ Vector<EditorData::EditedScene> EditorData::get_edited_scenes() const { return out_edited_scenes_list; } -void EditorData::set_edited_scene_version(uint64_t version, int scene_idx) { +void EditorData::set_edited_scene_version(uint64_t version, int p_scene_idx) { ERR_FAIL_INDEX(current_edited_scene, edited_scene.size()); - if (scene_idx < 0) { + if (p_scene_idx < 0) { edited_scene[current_edited_scene].version = version; } else { - ERR_FAIL_INDEX(scene_idx, edited_scene.size()); - edited_scene[scene_idx].version = version; + ERR_FAIL_INDEX(p_scene_idx, edited_scene.size()); + edited_scene[p_scene_idx].version = version; } } |