mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made Variant::NIL printable as "Null". Please everyone be on the lookout of bugs related to assigning an empty variant to a string, and expecting it to be not empty!

Browse Source
This commit is contained in:
Juan Linietsky 2017-01-08 17:23:04 -03:00
parent 547a57777b
commit 10938e8bb9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant.cpp
View File

@ -1502,7 +1502,7 @@ Variant::operator String() const {
switch( type ) {
case NIL: return "";
case NIL: return "Null";
case BOOL: return _data._bool ? "True" : "False";
case INT: return String::num(_data._int);
case REAL: return String::num(_data._real);

5
tools/editor/create_dialog.cpp
View File

@ -400,8 +400,11 @@ Object *CreateDialog::instance_selected() {
if (selected) {
String custom = selected->get_metadata(0);
Variant md = selected->get_metadata(0);
String custom;
if (md.get_type()!=Variant::NIL)
custom=md;
if (custom!=String()) {
if (EditorNode::get_editor_data().get_custom_types().has(custom)) {