From 2d529e6d6311f1ef042191c5e4675a2aac783025 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 31 Jan 2020 15:58:13 +0100 Subject: Remove the 3D camera gizmo icon The gizmo icon obstructed the line-based camera gizmo, which made it difficult to see the actual camera orientation. This also removes the unused SpatialStreamPlayer gizmo icon. This closes https://github.com/godotengine/godot-proposals/issues/425. --- editor/icons/icon_gizmo_spatial_stream_player.svg | 1 - editor/spatial_editor_gizmos.cpp | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 editor/icons/icon_gizmo_spatial_stream_player.svg diff --git a/editor/icons/icon_gizmo_spatial_stream_player.svg b/editor/icons/icon_gizmo_spatial_stream_player.svg deleted file mode 100644 index 473fd2c2cd..0000000000 --- a/editor/icons/icon_gizmo_spatial_stream_player.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index c94b0eeab0..348cbbbb22 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -1229,7 +1229,6 @@ CameraSpatialGizmoPlugin::CameraSpatialGizmoPlugin() { Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/camera", Color(0.8, 0.4, 0.8)); create_material("camera_material", gizmo_color); - create_icon_material("camera_icon", SpatialEditor::get_singleton()->get_icon("GizmoCamera", "EditorIcons")); create_handle_material("handles"); } @@ -1341,7 +1340,6 @@ void CameraSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) { Vector handles; Ref material = get_material("camera_material", p_gizmo); - Ref icon = get_material("camera_icon", p_gizmo); #define ADD_TRIANGLE(m_a, m_b, m_c) \ { \ @@ -1436,7 +1434,6 @@ void CameraSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) { #undef ADD_QUAD p_gizmo->add_lines(lines, material); - p_gizmo->add_unscaled_billboard(icon, 0.05); p_gizmo->add_handles(handles, get_material("handles")); ClippedCamera *clipcam = Object::cast_to(camera); -- cgit v1.2.3