From 28944e95e7ec129408128e0db33a4ad9eaa4c620 Mon Sep 17 00:00:00 2001 From: eska Date: Fri, 11 Nov 2016 03:48:13 +0100 Subject: [PATCH] Clarify a NULL comparison 'TreeItem::get_children()' does not return the child count, but rather a pointer to the children. This comparison caused an error during WebAssembly builds using the LLVM backend path. (cherry picked from commit 31f929caa2bc8422c0a6bb50f81500e1f4db101b) --- scene/gui/tree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index b8cc3786a7..4083e10cc3 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1305,7 +1305,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2& int root_ofs = children_pos.x + (hide_folding?cache.hseparation:cache.item_margin); int parent_ofs = p_pos.x + (hide_folding?cache.hseparation:cache.item_margin); Point2i root_pos = Point2i(root_ofs, children_pos.y + label_h/2)-cache.offset+p_draw_ofs; - if (c->get_children() > 0) + if (c->get_children() != NULL) root_pos -= Point2i(cache.arrow->get_width(),0); Point2i parent_pos = Point2i(parent_ofs - cache.arrow->get_width()/2, p_pos.y + label_h/2 + cache.arrow->get_height()/2)-cache.offset+p_draw_ofs;