diff options
| -rw-r--r-- | core/variant.cpp | 2 | ||||
| -rw-r--r-- | modules/visual_script/visual_script.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/create_dialog.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 96999212a8..a78c07d819 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1510,7 +1510,7 @@ Variant::operator String() const { switch( type ) { - case NIL: return "Null"; + case NIL: return ""; case BOOL: return _data._bool ? "True" : "False"; case INT: return String::num(_data._int); case REAL: return String::num(_data._real); diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 7c94e41331..9dc91d82f1 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -1351,8 +1351,8 @@ bool VisualScriptInstance::has_method(const StringName& p_method) const{ } -#define VSDEBUG(m_text) print_line(m_text) -//#define VSDEBUG(m_text) +//#define VSDEBUG(m_text) print_line(m_text) +#define VSDEBUG(m_text) Variant VisualScriptInstance::call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error){ diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index 3ab2e35242..e906976c13 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -292,9 +292,12 @@ String CreateDialog::get_selected_type() { Object *CreateDialog::instance_selected() { TreeItem *selected = search_options->get_selected(); + if (selected) { String custom = selected->get_metadata(0); + + if (custom!=String()) { if (EditorNode::get_editor_data().get_custom_types().has(custom)) { @@ -323,6 +326,7 @@ Object *CreateDialog::instance_selected() { } } + print_line("NONE"); return NULL; } |