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

Merge pull request #57912 from rcorre/fix-blender

Browse Source
This commit is contained in:
Rémi Verschelde 2022-02-10 16:53:01 +01:00 committed by GitHub
commit 519075cf41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -385,8 +385,6 @@ int Node3DEditorViewport::get_selected_count() const {
}
void Node3DEditorViewport::cancel_transform() {
_edit.mode = TRANSFORM_NONE;
List<Node *> &selection = editor_selection->get_selected_node_list();
for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
@ -402,7 +400,8 @@ void Node3DEditorViewport::cancel_transform() {
sp->set_global_transform(se->original);
}
surface->update();
finish_transform();
set_message(TTR("Transform Aborted."), 3);
}
@ -4061,12 +4060,9 @@ void Node3DEditorViewport::commit_transform() {
undo_redo->add_undo_method(sp, "set_global_transform", se->original);
}
undo_redo->commit_action();
_edit.mode = TRANSFORM_NONE;
_edit.instant = false;
spatial_editor->set_local_coords_enabled(_edit.original_local);
finish_transform();
set_message("");
spatial_editor->update_transform_gizmo();
surface->update();
}
void Node3DEditorViewport::update_transform(Point2 p_mousepos, bool p_shift) {
@ -4405,6 +4401,14 @@ void Node3DEditorViewport::update_transform(Point2 p_mousepos, bool p_shift) {
}
}
void Node3DEditorViewport::finish_transform() {
spatial_editor->set_local_coords_enabled(_edit.original_local);
spatial_editor->update_transform_gizmo();
_edit.mode = TRANSFORM_NONE;
_edit.instant = false;
surface->update();
}
Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, EditorNode *p_editor, int p_index) {
cpu_time_history_index = 0;
gpu_time_history_index = 0;

1
editor/plugins/node_3d_editor_plugin.h
View File

@ -409,6 +409,7 @@ private:
void begin_transform(TransformMode p_mode, bool instant);
void commit_transform();
void update_transform(Point2 p_mousepos, bool p_shift);
void finish_transform();
protected:
void _notification(int p_what);