Commit 3e25cf9e by Hein-Pieter van Braam

Add two missing Null checks

These Null checks were removed in #10581 but actually changed the logic of the functions in this case. This fixes #10654
parent 53c00109
......@@ -1546,7 +1546,9 @@ static void _find_type_arguments(GDCompletionContext &context, const GDParser::N
scr = NULL;
}
} else {
on_script = obj->get_script();
if (obj) {
on_script = obj->get_script();
}
}
}
......@@ -2237,7 +2239,9 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
scr = NULL;
}
} else {
on_script = obj->get_script();
if (obj) {
on_script = obj->get_script();
}
}
}
......
......@@ -1401,8 +1401,11 @@ void SceneTree::_live_edit_create_node_func(const NodePath &p_parent, const Stri
Node *n2 = n->get_node(p_parent);
Node *no = Object::cast_to<Node>(ClassDB::instance(p_type));
no->set_name(p_name);
if (!no) {
continue;
}
no->set_name(p_name);
n2->add_child(no);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment