summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-08 11:20:59 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-08 11:20:59 +0200
commitf202ebb4951ba4ac7ca69af11ff38b4a894684db (patch)
tree4cabb2c9f9e5dadd9c55f36e64a57b719294de95
parentab39f4ce6c38b8364183409b23256703948628af (diff)
parentd90d5eb3c1dccf56784ffee2cf4276e3bfe0b361 (diff)
downloadredot-engine-f202ebb4951ba4ac7ca69af11ff38b4a894684db.tar.gz
Merge pull request #90102 from themancalledjakob/fix-drag-drop-shadermaterial
Allow drag and dropping ShaderMaterial in 3D viewport
-rw-r--r--editor/plugins/node_3d_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 7e271bb68e..d09e4fd3db 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -4519,7 +4519,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
Ref<BaseMaterial3D> base_mat = res;
Ref<ShaderMaterial> shader_mat = res;
- if (base_mat.is_null() && !shader_mat.is_null()) {
+ if (base_mat.is_null() && shader_mat.is_null()) {
continue;
}