summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorJosh Faust <josh@torch3d.com>2018-05-11 11:20:27 -0700
committerJosh Faust <josh@torch3d.com>2018-05-11 11:20:27 -0700
commit4e58db9f1244a00b1f29d9a0b57f77cfe32c0a44 (patch)
tree46de09ee5ebd44376e1626fc82c3bef058e7c473 /editor
parent0902915c33883e5fcb39287e4bc82826497d233b (diff)
Fix crash on editor startup when running with platform=server
Diffstat (limited to 'editor')
-rw-r--r--editor/doc/doc_data.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index 3434aa33f9..c992ac5f16 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")