From df6b061dbb8836489016b223452add2c8e2a4874 Mon Sep 17 00:00:00 2001
From: Marcel Admiraal <madmiraal@users.noreply.github.com>
Date: Fri, 4 Dec 2020 15:39:45 +0000
Subject: Rename CubeMesh BoxMesh

---
 editor/code_editor.cpp                  | 2 +-
 editor/icons/BoxMesh.svg                | 1 +
 editor/icons/CubeMesh.svg               | 1 -
 editor/node_3d_editor_gizmos.cpp        | 8 ++++----
 editor/plugins/material_editor_plugin.h | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 editor/icons/BoxMesh.svg
 delete mode 100644 editor/icons/CubeMesh.svg

(limited to 'editor')

diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 823fd7e852..556b5717b3 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -873,7 +873,7 @@ Ref<Texture2D> CodeTextEditor::_get_completion_icon(const ScriptCodeCompletionOp
 			tex = get_theme_icon("MemberMethod", "EditorIcons");
 			break;
 		case ScriptCodeCompletionOption::KIND_PLAIN_TEXT:
-			tex = get_theme_icon("CubeMesh", "EditorIcons");
+			tex = get_theme_icon("BoxMesh", "EditorIcons");
 			break;
 		default:
 			tex = get_theme_icon("String", "EditorIcons");
diff --git a/editor/icons/BoxMesh.svg b/editor/icons/BoxMesh.svg
new file mode 100644
index 0000000000..d540858248
--- /dev/null
+++ b/editor/icons/BoxMesh.svg
@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 14.999999 14.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8 .88867-7 3.5v7.2227l7 3.5 7-3.5v-7.2227zm0 2.1152 3.9395 1.9707-3.9395 1.9688-3.9395-1.9688zm-5 3.5527 4 2v3.9414l-4-2.002zm10 0v3.9395l-4 2.002v-3.9414z" fill="#ffd684" stroke-width="1.0667" transform="scale(.9375)"/></svg>
diff --git a/editor/icons/CubeMesh.svg b/editor/icons/CubeMesh.svg
deleted file mode 100644
index d540858248..0000000000
--- a/editor/icons/CubeMesh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" viewBox="0 0 14.999999 14.999999" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m8 .88867-7 3.5v7.2227l7 3.5 7-3.5v-7.2227zm0 2.1152 3.9395 1.9707-3.9395 1.9688-3.9395-1.9688zm-5 3.5527 4 2v3.9414l-4-2.002zm10 0v3.9395l-4 2.002v-3.9414z" fill="#ffd684" stroke-width="1.0667" transform="scale(.9375)"/></svg>
diff --git a/editor/node_3d_editor_gizmos.cpp b/editor/node_3d_editor_gizmos.cpp
index 97bafdd167..7e94f17d48 100644
--- a/editor/node_3d_editor_gizmos.cpp
+++ b/editor/node_3d_editor_gizmos.cpp
@@ -398,10 +398,10 @@ void EditorNode3DGizmo::add_handles(const Vector<Vector3> &p_handles, const Ref<
 void EditorNode3DGizmo::add_solid_box(Ref<Material> &p_material, Vector3 p_size, Vector3 p_position) {
 	ERR_FAIL_COND(!spatial_node);
 
-	CubeMesh cubem;
-	cubem.set_size(p_size);
+	BoxMesh box_mesh;
+	box_mesh.set_size(p_size);
 
-	Array arrays = cubem.surface_get_arrays(0);
+	Array arrays = box_mesh.surface_get_arrays(0);
 	PackedVector3Array vertex = arrays[RS::ARRAY_VERTEX];
 	Vector3 *w = vertex.ptrw();
 
@@ -412,7 +412,7 @@ void EditorNode3DGizmo::add_solid_box(Ref<Material> &p_material, Vector3 p_size,
 	arrays[RS::ARRAY_VERTEX] = vertex;
 
 	Ref<ArrayMesh> m = memnew(ArrayMesh);
-	m->add_surface_from_arrays(cubem.surface_get_primitive_type(0), arrays);
+	m->add_surface_from_arrays(box_mesh.surface_get_primitive_type(0), arrays);
 	m->surface_set_material(0, p_material);
 	add_mesh(m);
 }
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index a6df790620..570ba9ae03 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -55,7 +55,7 @@ class MaterialEditor : public Control {
 	Camera3D *camera;
 
 	Ref<SphereMesh> sphere_mesh;
-	Ref<CubeMesh> box_mesh;
+	Ref<BoxMesh> box_mesh;
 
 	TextureButton *sphere_switch;
 	TextureButton *box_switch;
-- 
cgit v1.2.3