Browse Source

Restore ability to drag 'n' drop Mesh to Viewport

Micky 3 years ago
parent
commit
6aa4c9c77a
1 changed files with 3 additions and 0 deletions
  1. 3 0
      editor/plugins/node_3d_editor_plugin.cpp

+ 3 - 0
editor/plugins/node_3d_editor_plugin.cpp

@@ -4113,6 +4113,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
 						continue;
 						continue;
 					}
 					}
 					Ref<PackedScene> scn = res;
 					Ref<PackedScene> scn = res;
+					Ref<Mesh> mesh = res;
 					Ref<Material> mat = res;
 					Ref<Material> mat = res;
 					Ref<Texture2D> tex = res;
 					Ref<Texture2D> tex = res;
 					if (scn.is_valid()) {
 					if (scn.is_valid()) {
@@ -4131,6 +4132,8 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
 
 
 						spatial_editor->set_preview_material(mat);
 						spatial_editor->set_preview_material(mat);
 						break;
 						break;
+					} else if (mesh.is_valid()) {
+						// Let the mesh pass.
 					} else if (tex.is_valid()) {
 					} else if (tex.is_valid()) {
 						Ref<StandardMaterial3D> new_mat = memnew(StandardMaterial3D);
 						Ref<StandardMaterial3D> new_mat = memnew(StandardMaterial3D);
 						new_mat->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, tex);
 						new_mat->set_texture(BaseMaterial3D::TEXTURE_ALBEDO, tex);