asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #11446 from marcelofg55/ciep_null_checks

Browse source 
Add missing NULL checks on CanvasItemEditor

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-21 10:02:20 +02:00 committed by GitHub
commit 601564e9a9
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -2577,6 +2577,8 @@ void CanvasItemEditor::_draw_bones() {
} }
void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p_xform) { void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p_xform) {
ERR_FAIL_COND(!p_node);
RID viewport_ci = viewport->get_canvas_item(); RID viewport_ci = viewport->get_canvas_item();
Transform2D transform_ci = p_xform; Transform2D transform_ci = p_xform;
@ -2605,6 +2607,8 @@ void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p
} }
void CanvasItemEditor::_build_bones_list(Node *p_node) { void CanvasItemEditor::_build_bones_list(Node *p_node) {
ERR_FAIL_COND(!p_node);
for (int i = 0; i < p_node->get_child_count(); i++) { for (int i = 0; i < p_node->get_child_count(); i++) {
_build_bones_list(p_node->get_child(i)); _build_bones_list(p_node->get_child(i));
} }
@ -2626,6 +2630,8 @@ void CanvasItemEditor::_build_bones_list(Node *p_node) {
} }
void CanvasItemEditor::_get_encompassing_rect(Node *p_node, Rect2 &r_rect, const Transform2D &p_xform) { void CanvasItemEditor::_get_encompassing_rect(Node *p_node, Rect2 &r_rect, const Transform2D &p_xform) {
ERR_FAIL_COND(!p_node);
for (int i = 0; i < p_node->get_child_count(); i++) { for (int i = 0; i < p_node->get_child_count(); i++) {
_get_encompassing_rect(p_node->get_child(i), r_rect, p_xform); _get_encompassing_rect(p_node->get_child(i), r_rect, p_xform);
} }