3 files changed, 50 insertions, 25 deletions

diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 0f67663948..dbd1b12a94 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -376,11 +376,11 @@ void AnimationNodeBlendTreeEditor::_add_node(int p_idx) {
 	undo_redo->commit_action();
 }
 
-void AnimationNodeBlendTreeEditor::_popup(bool p_has_input_ports, const Vector2 &p_popup_position, const Vector2 &p_node_position) {
+void AnimationNodeBlendTreeEditor::_popup(bool p_has_input_ports, const Vector2 &p_node_position) {
 	_update_options_menu(p_has_input_ports);
 	use_position_from_popup_menu = true;
 	position_from_popup_menu = p_node_position;
-	add_node->get_popup()->set_position(p_popup_position);
+	add_node->get_popup()->set_position(graph->get_screen_position() + graph->get_local_mouse_position());
 	add_node->get_popup()->reset_size();
 	add_node->get_popup()->popup();
 }
@@ -390,7 +390,7 @@ void AnimationNodeBlendTreeEditor::_popup_request(const Vector2 &p_position) {
 		return;
 	}
 
-	_popup(false, graph->get_screen_position() + graph->get_local_mouse_position(), p_position);
+	_popup(false, p_position);
 }
 
 void AnimationNodeBlendTreeEditor::_connection_to_empty(const String &p_from, int p_from_slot, const Vector2 &p_release_position) {
@@ -401,7 +401,7 @@ void AnimationNodeBlendTreeEditor::_connection_to_empty(const String &p_from, in
 	Ref<AnimationNode> node = blend_tree->get_node(p_from);
 	if (node.is_valid()) {
 		from_node = p_from;
-		_popup(true, p_release_position, graph->get_global_mouse_position());
+		_popup(true, p_release_position);
 	}
 }
 
@@ -414,7 +414,7 @@ void AnimationNodeBlendTreeEditor::_connection_from_empty(const String &p_to, in
 	if (node.is_valid()) {
 		to_node = p_to;
 		to_slot = p_to_slot;
-		_popup(false, p_release_position, graph->get_global_mouse_position());
+		_popup(false, p_release_position);
 	}
 }
 
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h
index fb19cce147..4b55aa9b3f 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.h
+++ b/editor/plugins/animation_blend_tree_editor_plugin.h
@@ -117,7 +117,7 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
 	void _filter_toggled();
 	Ref<AnimationNode> _filter_edit;
 
-	void _popup(bool p_has_input_ports, const Vector2 &p_popup_position, const Vector2 &p_node_position);
+	void _popup(bool p_has_input_ports, const Vector2 &p_node_position);
 	void _popup_request(const Vector2 &p_position);
 	void _connection_to_empty(const String &p_from, int p_from_slot, const Vector2 &p_release_position);
 	void _connection_from_empty(const String &p_to, int p_to_slot, const Vector2 &p_release_position);
diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp
index 5a7b0321b7..63ca78d6c0 100644
--- a/editor/plugins/path_3d_editor_plugin.cpp
+++ b/editor/plugins/path_3d_editor_plugin.cpp
@@ -240,38 +240,63 @@ void Path3DGizmo::redraw() {
 		return;
 	}
 
-	Vector<Vector3> v3a = c->tessellate();
-	//Vector<Vector3> v3a=c->get_baked_points();
+	real_t interval = 0.1;
+	const real_t length = c->get_baked_length();
 
-	int v3s = v3a.size();
-	if (v3s == 0) {
-		return;
-	}
-	Vector<Vector3> v3p;
-	const Vector3 *r = v3a.ptr();
-
-	// BUG: the following won't work when v3s, avoid drawing as a temporary workaround.
-	for (int i = 0; i < v3s - 1; i++) {
-		v3p.push_back(r[i]);
-		v3p.push_back(r[i + 1]);
-		//v3p.push_back(r[i]);
-		//v3p.push_back(r[i]+Vector3(0,0.2,0));
-	}
+	// 1. Draw curve and bones.
+	if (length > CMP_EPSILON) {
+		const int sample_count = int(length / interval) + 2;
+		interval = length / (sample_count - 1); // Recalculate real interval length.
+
+		Vector<Transform3D> frames;
+		frames.resize(sample_count);
+
+		{
+			Transform3D *w = frames.ptrw();
+
+			for (int i = 0; i < sample_count; i++) {
+				w[i] = c->sample_baked_with_rotation(i * interval, true, true);
+			}
+		}
+
+		const Transform3D *r = frames.ptr();
+		Vector<Vector3> v3p;
+		for (int i = 0; i < sample_count - 1; i++) {
+			const Vector3 p1 = r[i].origin;
+			const Vector3 p2 = r[i + 1].origin;
+			const Vector3 side = r[i].basis.get_column(0);
+			const Vector3 up = r[i].basis.get_column(1);
+			const Vector3 forward = r[i].basis.get_column(2);
+
+			// Curve segment.
+			v3p.push_back(p1);
+			v3p.push_back(p2);
+
+			// Fish Bone.
+			v3p.push_back(p1);
+			v3p.push_back(p1 + (side - forward) * 0.06);
+
+			v3p.push_back(p1);
+			v3p.push_back(p1 + (-side - forward) * 0.06);
+
+			v3p.push_back(p1);
+			v3p.push_back(p1 + up * 0.03);
+		}
 
-	if (v3p.size() > 1) {
 		add_lines(v3p, path_material);
 		add_collision_segments(v3p);
 	}
 
+	// 2. Draw handles.
 	if (Path3DEditorPlugin::singleton->get_edited_path() == path) {
-		v3p.clear();
+		Vector<Vector3> v3p;
 		Vector<Vector3> handle_points;
 		Vector<Vector3> sec_handle_points;
 
 		for (int i = 0; i < c->get_point_count(); i++) {
 			Vector3 p = c->get_point_position(i);
 			handle_points.push_back(p);
-			// push Out points first so they get selected if the In and Out points are on top of each other.
+			// Push out points first so they get selected if the In and Out points are on top of each other.
 			if (i < c->get_point_count() - 1) {
 				v3p.push_back(p);
 				v3p.push_back(p + c->get_point_out(i));