noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #5920 from 29jm/fix-warnings

Browse Source 
Fix some more warnings
This commit is contained in:
Juan Linietsky
2016-09-10 12:21:02 -03:00
committed by GitHub
parent 026c7913cf a4674bda47
commit fc61eb37ce
25 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
View File

@@ -147,7 +147,7 @@ public:
dst = dst.plus_file(bitmasks[i].get_file().basename() + ".pbm");
Error err = plugin->import(dst, imd);
plugin->import(dst, imd);
}
hide();

2
tools/editor/io_plugins/editor_sample_import_plugin.cpp
View File

@@ -298,7 +298,7 @@ public:
dst = dst.plus_file(samples[i].get_file().basename()+".smp");
Error err = plugin->import(dst,imd);
plugin->import(dst,imd);
}
hide();

7
tools/editor/io_plugins/editor_scene_import_plugin.cpp
View File

@@ -1447,6 +1447,7 @@ void EditorSceneImportPlugin::_find_resources(const Variant& p_var, Map<Ref<Imag
}
} break;
default: {}
}
@@ -2325,7 +2326,7 @@ void EditorSceneImportPlugin::_filter_tracks(Node *scene, const String& p_text)
if (!scene->has_node(String("AnimationPlayer")))
return;
Node* n = scene->get_node(String("AnimationPlayer"));
Node* n = scene->get_node(String("AnimationPlayer"));
ERR_FAIL_COND(!n);
AnimationPlayer *anim = n->cast_to<AnimationPlayer>();
ERR_FAIL_COND(!anim);
@@ -2443,7 +2444,7 @@ void EditorSceneImportPlugin::_optimize_animations(Node *scene, float p_max_lin_
if (!scene->has_node(String("AnimationPlayer")))
return;
Node* n = scene->get_node(String("AnimationPlayer"));
Node* n = scene->get_node(String("AnimationPlayer"));
ERR_FAIL_COND(!n);
AnimationPlayer *anim = n->cast_to<AnimationPlayer>();
ERR_FAIL_COND(!anim);
@@ -2842,7 +2843,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
}
}
Error err = EditorTextureImportPlugin::get_singleton()->import(target_path,imd);
EditorTextureImportPlugin::get_singleton()->import(target_path,imd);
}
}