godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39074 from vnen/gdscript-assert-message 

Fix assert message when no custom message is set
This commit is contained in:
Rémi Verschelde 2020-05-27 08:23:17 +02:00 committed by GitHub
parent 9daee31ba9 f29a2e2606
commit ab460e7a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdscript/gdscript_function.cpp
View File

@ -1430,11 +1430,14 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
#ifdef DEBUG_ENABLED
GET_VARIANT_PTR(test, 1);
GET_VARIANT_PTR(message, 2);
bool result = test->booleanize();
if (!result) {
const String &message_str = *message;
String message_str;
if (_code_ptr[ip + 2] != 0) {
GET_VARIANT_PTR(message, 2);
message_str = *message;
}
if (message_str.empty()) {
err_text = "Assertion failed.";
} else {