summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-12-07 11:51:01 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-12-07 11:51:01 -0300
commit5e2f327d4beadf98fa9f2af30882e18fb817249a (patch)
treeecd10e0eb530e823694e65a18bff1d178e4c3ff3 /core/io
parent8bdf2be4a6193252ebbfd44c6f7e8a295b015cd9 (diff)
parent7ba484bc7499a58635cc061b318d003c5f8c371f (diff)
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/io')
-rw-r--r--core/io/resource_format_binary.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 1a0552e8d1..4cd3cd595f 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -905,7 +905,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
error=ERR_FILE_UNRECOGNIZED;
ERR_EXPLAIN("Unrecognized binary resource file: "+local_path);
- ERR_FAIL_V();
+ ERR_FAIL();
}
bool big_endian = f->get_32();