summaryrefslogtreecommitdiff
path: root/editor/import
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-09-07 21:48:50 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2017-09-08 14:57:48 +0200
commit67a706fc1b9721f3f06eef8be7312f175e2041ce (patch)
treebd0fb17813ac40b1b1e21a1e3a7236b30b7d69bb /editor/import
parentd1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff)
Fix various assorted warnings
Fix various warnings that don't have enough instances to merit individual commits. Also fixes a potential bug in audio_server.cpp.
Diffstat (limited to 'editor/import')
-rw-r--r--editor/import/resource_importer_scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index 594728d2e0..16a10b6dcb 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -1024,7 +1024,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
String root_type = p_options["nodes/root_type"];
if (scene->get_class() != root_type) {
- Node *base_node = base_node = Object::cast_to<Node>(ClassDB::instance(root_type));
+ Node *base_node = Object::cast_to<Node>(ClassDB::instance(root_type));
if (base_node) {