From be588f9493ad40526c3e6f304ce8ad54fe3c86dd Mon Sep 17 00:00:00 2001 From: Josh Faust Date: Fri, 11 May 2018 11:20:27 -0700 Subject: [PATCH] Fix crash on editor startup when running with platform=server (cherry picked from commit 4e58db9f1244a00b1f29d9a0b57f77cfe32c0a44) --- editor/doc/doc_data.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 3434aa33f99..c992ac5f161 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -567,6 +567,9 @@ void DocData::generate(bool p_basic_types) { PropertyDoc pd; Engine::Singleton &s = E->get(); + if (!s.ptr) { + continue; + } pd.name = s.name; pd.type = s.ptr->get_class(); while (String(ClassDB::get_parent_class(pd.type)) != "Object")