Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Core: Identity compare objects by id, not by pointers

Browse source
This commit is contained in:
Dmitrii Maganov 2023-02-24 22:58:00 +02:00
parent 6296b46008
commit c5f7a89b0f
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/variant/variant.cpp
View file

@ -3499,7 +3499,7 @@ bool Variant::identity_compare(const Variant &p_variant) const {
switch (type) { switch (type) {
case OBJECT: { case OBJECT: {
return _get_obj().obj == p_variant._get_obj().obj; return _get_obj().id == p_variant._get_obj().id;
} break; } break;
case DICTIONARY: { case DICTIONARY: {

8
tests/core/variant/test_variant.h
View file

@ -1056,6 +1056,14 @@ TEST_CASE("[Variant] Identity comparison") {
Variant obj_null_two_var = Variant((Object *)nullptr); Variant obj_null_two_var = Variant((Object *)nullptr);
CHECK(obj_null_one_var.identity_compare(obj_null_one_var)); CHECK(obj_null_one_var.identity_compare(obj_null_one_var));
CHECK(obj_null_one_var.identity_compare(obj_null_two_var)); CHECK(obj_null_one_var.identity_compare(obj_null_two_var));
Object *freed_one = new Object();
Variant freed_one_var = freed_one;
delete freed_one;
Object *freed_two = new Object();
Variant freed_two_var = freed_two;
delete freed_two;
CHECK_FALSE(freed_one_var.identity_compare(freed_two_var));
} }
TEST_CASE("[Variant] Nested array comparison") { TEST_CASE("[Variant] Nested array comparison") {