Merge pull request #15844 from letheed/better-error-msg

Make cyclic resource inclusion error message more helpful
This commit is contained in:
Rémi Verschelde 2018-01-24 11:52:52 +01:00 committed by GitHub
commit 5342ec32b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -74,7 +74,7 @@ void Resource::set_path(const String &p_path, bool p_take_over) {
bool exists = ResourceCache::resources.has(p_path); bool exists = ResourceCache::resources.has(p_path);
ResourceCache::lock->read_unlock(); ResourceCache::lock->read_unlock();
ERR_EXPLAIN("Another resource is loaded from path: " + p_path); ERR_EXPLAIN("Another resource is loaded from path: " + p_path + " (possible cyclic resource inclusion)");
ERR_FAIL_COND(exists); ERR_FAIL_COND(exists);
} }
} }