summaryrefslogtreecommitdiffstats
path: root/modules/assimp/import_utils.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-11-11 13:27:51 +0100
committerGitHub <noreply@github.com>2019-11-11 13:27:51 +0100
commit6b1628f9fcc50dc16af08c2b87f27108ff6e15c5 (patch)
tree5bb1ef20e714dc1d9a8421ee2419036534d2f230 /modules/assimp/import_utils.h
parent5c038acdc159708113fdc911c44abf1d6dcdbdf7 (diff)
parent83069a3c0f01507acd24672c90b24c9eba868aba (diff)
downloadredot-engine-6b1628f9fcc50dc16af08c2b87f27108ff6e15c5.tar.gz
Merge pull request #33517 from madmiraal/fix-_MSG-macros
Send *_MSG macros' explanations directly to the _err_print_error().
Diffstat (limited to 'modules/assimp/import_utils.h')
-rw-r--r--modules/assimp/import_utils.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h
index 4be76ade0f..7b14804ddc 100644
--- a/modules/assimp/import_utils.h
+++ b/modules/assimp/import_utils.h
@@ -369,8 +369,7 @@ public:
state.path_to_image_cache.insert(p_path, img);
return img;
} else if (tex->CheckFormat("dds")) {
- ERR_EXPLAIN("Open Asset Import: Embedded dds not implemented");
- ERR_FAIL_COND_V(true, Ref<Image>());
+ ERR_FAIL_COND_V_MSG(true, Ref<Image>(), "Open Asset Import: Embedded dds not implemented");
}
} else {
Ref<Image> img;