godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Fix suspicious | and + operators

Browse Source 
(cherry picked from commit d0621b954b)
This commit is contained in:
Rafał Mikrut
2020-02-23 09:28:54 +01:00
committed by Rémi Verschelde
parent 6e300a0c49
commit d001ca320d
2 changed files with 2 additions and 2 deletions
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; 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()) { for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
if (E->get().findn(F->get()) != -1) if (E->get().findn(F->get()) != -1)
in_modifier = true; 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"); Vector<String> props = dp.split("\n");
String vendor; String vendor;
String device; String device;
d.description + "Device ID: " + d.id + "\n"; d.description = "Device ID: " + d.id + "\n";
d.api_level = 0; d.api_level = 0;
for (int j = 0; j < props.size(); j++) { for (int j = 0; j < props.size(); j++) {