Reverted printable null object, seems to cause bugs around and not sure why.

Will have to check better, likely for 3.0
This commit is contained in:
Juan Linietsky 2016-08-06 20:13:27 -03:00
parent 9890c1d2ca
commit 9714a36e65
3 changed files with 7 additions and 3 deletions

View File

@ -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);

View File

@ -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){

View File

@ -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;
}