aboutsummaryrefslogtreecommitdiff
path: root/editor/plugins
diff options
context:
space:
mode:
authorNoshyaar2017-12-31 12:35:39 +0700
committerGitHub2017-12-31 12:35:39 +0700
commit16158d8db79459529a58e01d6f01f24bd851b3f1 (patch)
tree56740131c24d98473018c2b544ea460eb861fdee /editor/plugins
parent7e2941f62bc4e4f400ba7c634ad422c35d50ad7e (diff)
parent9ba9e3722091c417c62bdc4637e9228fd32bb726 (diff)
downloadgodot-16158d8db79459529a58e01d6f01f24bd851b3f1.tar.gz
godot-16158d8db79459529a58e01d6f01f24bd851b3f1.tar.zst
godot-16158d8db79459529a58e01d6f01f24bd851b3f1.zip
Merge pull request #15209 from firefly2442/StringBooleanProblem
prevent strings from being evaluated to just "true"
Diffstat (limited to 'editor/plugins')
-rw-r--r--editor/plugins/spatial_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index b26038fe0..e0a697ec2 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -3213,7 +3213,7 @@ bool SpatialEditorViewport::can_drop_data_fw(const Point2 &p_point, const Varian
continue;
}
memdelete(instanced_scene);
- } else if (type == "Mesh" || "ArrayMesh" || "PrimitiveMesh") {
+ } else if (type == "Mesh" || type == "ArrayMesh" || type == "PrimitiveMesh") {
Ref<Mesh> mesh = ResourceLoader::load(files[i]);
if (!mesh.is_valid()) {
continue;