diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-23 20:49:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 20:49:30 +0200 |
| commit | fc0b6abe52cb4e3312a4a9161849614184cf2d3b (patch) | |
| tree | a5f50ab1b27195785f97aed995786ff3db9cd24b /editor | |
| parent | 649e76aa389000c0cbda94b92f596f8c3b96b76f (diff) | |
| parent | 6aa4c9c77af6bb3850db90ce61162457fc95ff89 (diff) | |
Merge pull request #64617 from Mickeon/editor-restore-mesh-drop
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index d14c2cbce3..5aa1046166 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -4130,6 +4130,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant continue; } Ref<PackedScene> scn = res; + Ref<Mesh> mesh = res; Ref<Material> mat = res; Ref<Texture2D> tex = res; if (scn.is_valid()) { @@ -4148,6 +4149,8 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant spatial_editor->set_preview_material(mat); break; + } else if (mesh.is_valid()) { + // Let the mesh pass. } else if (tex.is_valid()) { Ref<StandardMaterial3D> new_mat = memnew(StandardMaterial3D); new_mat->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, tex); |