diff options
| author | Juan Linietsky | 2015-08-25 00:08:45 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-08-25 00:08:45 -0300 |
| commit | eff2931b2ab4db9d47d822e5ef66dce941c90d98 (patch) | |
| tree | 66f18523a8f33cbd685ded670c3648c2e47a740d /tools/editor/editor_data.cpp | |
| parent | 0d77277a860f56b5f596c3d930ec2209cee95517 (diff) | |
| download | godot-eff2931b2ab4db9d47d822e5ef66dce941c90d98.tar.gz godot-eff2931b2ab4db9d47d822e5ef66dce941c90d98.tar.zst godot-eff2931b2ab4db9d47d822e5ef66dce941c90d98.zip | |
Multiple, simultaneous node editing spuport!!
..but will you be brave enough to try it? :)
Diffstat (limited to 'tools/editor/editor_data.cpp')
| -rw-r--r-- | tools/editor/editor_data.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp index 7f42f19a9..ac68fcb07 100644 --- a/tools/editor/editor_data.cpp +++ b/tools/editor/editor_data.cpp @@ -39,7 +39,7 @@ void EditorHistory::_cleanup_history() { bool fail=false; for(int j=0;j<history[i].path.size();j++) { - if (!history[i].path[j].res.is_null()) + if (!history[i].path[j].ref.is_null()) continue; if (ObjectDB::get_instance(history[i].path[j].object)) @@ -70,10 +70,10 @@ void EditorHistory::_add_object(ObjectID p_object,const String& p_property,int p Object *obj = ObjectDB::get_instance(p_object); ERR_FAIL_COND(!obj); - Resource *r = obj->cast_to<Resource>(); + Reference *r = obj->cast_to<Reference>(); Obj o; if (r) - o.res=RES(r); + o.ref=REF(r); o.object=p_object; o.property=p_property; |