gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-16 02:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36478 from qarmin/supsicious_operators_everywhere

Browse source 
Fix suspicious | and + operators
This commit is contained in:
Rémi Verschelde 2020-02-23 10:30:06 +01:00 committed by GitHub
parent c9e1d98c62 d0621b954b
commit 223c5ef8a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/visual_script/visual_script_property_selector.cpp
View file

@ -355,7 +355,7 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
continue;
}
bool in_modifier = false | p_modifiers.empty();
bool in_modifier = p_modifiers.empty();
for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
if (E->get().findn(F->get()) != -1)
in_modifier = true;

2
platform/android/export/export.cpp
View file

@ -337,7 +337,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
Vector<String> props = dp.split("\n");
String vendor;
String device;
d.description + "Device ID: " + d.id + "\n";
d.description = "Device ID: " + d.id + "\n";
d.api_level = 0;
for (int j = 0; j < props.size(); j++) {