Merge pull request #96766 from ryevdokimov/hide-white-circle-outline

akien-mga · akien-mga · commit 71a7e37a4339 · 2024-09-19T17:13:20.000+02:00
Hide white circle outline during instant transformations
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -3997,7 +3997,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {
 	xform.orthonormalize();
 	xform.basis.scale(scale);
 	RenderingServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[3], xform);
-	RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && transform_gizmo_visible && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE));
+	RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE));
 }
 
 void Node3DEditorViewport::set_state(const Dictionary &p_state) {

Original file line number	Diff line number	Diff line change
`@@ -3997,7 +3997,7 @@ void Node3DEditorViewport::update_transform_gizmo_view() {`
`3997`	`3997`	`xform.orthonormalize();`
`3998`	`3998`	`xform.basis.scale(scale);`
`3999`	`3999`	`RenderingServer::get_singleton()->instance_set_transform(rotate_gizmo_instance[3], xform);`
`4000`		`- RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && transform_gizmo_visible && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT \|\| spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE));`
	`4000`	`+ RenderingServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[3], spatial_editor->is_gizmo_visible() && !_edit.instant && transform_gizmo_visible && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT \|\| spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE));`
`4001`	`4001`	`}`
`4002`	`4002`
`4003`	`4003`	`void Node3DEditorViewport::set_state(const Dictionary &p_state) {`