Fix issue #1275
This commit is contained in:
parent
b2f9acb8c9
commit
cd4d4b97e3
|
@ -54,6 +54,8 @@ void Polygon2DEditor::_notification(int p_what) {
|
||||||
b_snap_enable->set_icon( get_icon("Snap", "EditorIcons"));
|
b_snap_enable->set_icon( get_icon("Snap", "EditorIcons"));
|
||||||
uv_icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
|
uv_icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
|
||||||
|
|
||||||
|
get_tree()->connect("node_removed", this, "_node_removed");
|
||||||
|
|
||||||
} break;
|
} break;
|
||||||
case NOTIFICATION_FIXED_PROCESS: {
|
case NOTIFICATION_FIXED_PROCESS: {
|
||||||
|
|
||||||
|
@ -65,8 +67,10 @@ void Polygon2DEditor::_notification(int p_what) {
|
||||||
void Polygon2DEditor::_node_removed(Node *p_node) {
|
void Polygon2DEditor::_node_removed(Node *p_node) {
|
||||||
|
|
||||||
if(p_node==node) {
|
if(p_node==node) {
|
||||||
node=NULL;
|
edit(NULL);
|
||||||
hide();
|
hide();
|
||||||
|
|
||||||
|
canvas_item_editor->get_viewport_control()->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -757,16 +761,13 @@ void Polygon2DEditor::edit(Node *p_collision_polygon) {
|
||||||
node=p_collision_polygon->cast_to<Polygon2D>();
|
node=p_collision_polygon->cast_to<Polygon2D>();
|
||||||
if (!canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
|
if (!canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
|
||||||
canvas_item_editor->get_viewport_control()->connect("draw",this,"_canvas_draw");
|
canvas_item_editor->get_viewport_control()->connect("draw",this,"_canvas_draw");
|
||||||
node->connect("exit_tree",this,"_node_removed",varray(),CONNECT_ONESHOT);
|
|
||||||
wip.clear();
|
wip.clear();
|
||||||
wip_active=false;
|
wip_active=false;
|
||||||
edited_point=-1;
|
edited_point=-1;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (node)
|
|
||||||
node->disconnect("exit_tree",this,"_node_removed");
|
|
||||||
|
|
||||||
node=NULL;
|
node=NULL;
|
||||||
|
|
||||||
if (canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
|
if (canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))
|
||||||
|
|
Loading…
Reference in a new issue