summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp4
-rw-r--r--editor/plugins/polygon_2d_editor_plugin.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index b0e812a130..86d6799b19 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -573,10 +573,10 @@ bool CanvasItemEditor::_get_bone_shape(Vector<Vector2> *shape, Vector<Vector2> *
Node2D *from_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().from));
Node2D *to_node = Object::cast_to<Node2D>(ObjectDB::get_instance(bone->key().to));
- if (!from_node->is_inside_tree())
- return false; //may have been removed
if (!from_node)
return false;
+ if (!from_node->is_inside_tree())
+ return false; //may have been removed
if (!to_node && bone->get().length == 0)
return false;
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index 1ac7ee89d6..1d7b4ffa41 100644
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -482,6 +482,7 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) {
polygons_prev = node->get_polygons();
node->set_polygon(points_prev);
node->set_uv(points_prev);
+ node->set_internal_vertex_count(0);
uv_edit_draw->update();
} else {