Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 13:41:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix highlight typo

Browse Source 
(cherry picked from commit d51fe99a8b)
This commit is contained in:
supaiku 2017-04-06 17:35:08 +02:00 committed by Rémi Verschelde
parent a46dcfe12f
commit fda4911b6e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@ -1120,7 +1120,7 @@ void EditorNode::_dialog_action(String p_file) {
Globals::get_singleton()->set("application/main_scene", p_file);
Globals::get_singleton()->set_persisting("application/main_scene", true);
Globals::get_singleton()->save();
//would be nice to show the project manager opened with the hilighted field..
//would be nice to show the project manager opened with the highlighted field..
} break;
case FILE_SAVE_OPTIMIZED: {

12
editor/plugins/spatial_editor_plugin.cpp
View File

@ -595,7 +595,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil
return false;
if (get_selected_count() == 0) {
if (p_hilite_only)
spatial_editor->select_gizmo_hilight_axis(-1);
spatial_editor->select_gizmo_highlight_axis(-1);
return false;
}
@ -629,7 +629,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil
if (p_hilite_only) {
spatial_editor->select_gizmo_hilight_axis(col_axis);
spatial_editor->select_gizmo_highlight_axis(col_axis);
} else {
//handle rotate
@ -669,7 +669,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil
if (p_hilite_only) {
spatial_editor->select_gizmo_hilight_axis(col_axis + 3);
spatial_editor->select_gizmo_highlight_axis(col_axis + 3);
} else {
//handle rotate
_edit.mode = TRANSFORM_ROTATE;
@ -681,7 +681,7 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hil
}
if (p_hilite_only)
spatial_editor->select_gizmo_hilight_axis(-1);
spatial_editor->select_gizmo_highlight_axis(-1);
return false;
}
@ -1140,7 +1140,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
spatial_editor->set_over_gizmo_handle(selected_handle);
spatial_editor->get_selected()->update_gizmo();
if (selected_handle != -1)
spatial_editor->select_gizmo_hilight_axis(-1);
spatial_editor->select_gizmo_highlight_axis(-1);
}
}
}
@ -2271,7 +2271,7 @@ SpatialEditorSelectedItem::~SpatialEditorSelectedItem() {
VisualServer::get_singleton()->free(sbox_instance);
}
void SpatialEditor::select_gizmo_hilight_axis(int p_axis) {
void SpatialEditor::select_gizmo_highlight_axis(int p_axis) {
for (int i = 0; i < 3; i++) {

2
editor/plugins/spatial_editor_plugin.h
View File

@ -484,7 +484,7 @@ public:
void update_transform_gizmo();
void select_gizmo_hilight_axis(int p_axis);
void select_gizmo_highlight_axis(int p_axis);
void set_custom_camera(Node *p_camera) { custom_camera = p_camera; }
void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }