瀏覽代碼

Merge pull request #13956 from poke1024/fix-poly2d-mode-change

Fixes Polygon2D wip mode closing when editing mode is changed
Rémi Verschelde 7 年之前
父節點
當前提交
7885360f3f
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      editor/plugins/abstract_polygon_2d_editor.cpp

+ 5 - 2
editor/plugins/abstract_polygon_2d_editor.cpp

@@ -167,7 +167,7 @@ void AbstractPolygon2DEditor::_menu_option(int p_option) {
 		} break;
 		case MODE_EDIT: {
 
-			wip_active = false;
+			_wip_close();
 			mode = MODE_EDIT;
 			button_create->set_pressed(false);
 			button_edit->set_pressed(true);
@@ -175,7 +175,7 @@ void AbstractPolygon2DEditor::_menu_option(int p_option) {
 		} break;
 		case MODE_DELETE: {
 
-			wip_active = false;
+			_wip_close();
 			mode = MODE_DELETE;
 			button_create->set_pressed(false);
 			button_edit->set_pressed(false);
@@ -224,6 +224,9 @@ void AbstractPolygon2DEditor::_wip_changed() {
 }
 
 void AbstractPolygon2DEditor::_wip_close() {
+	if (!wip_active)
+		return;
+
 	if (_is_line()) {
 
 		_set_polygon(0, wip);