diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-09 10:23:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 10:23:21 +0100 |
| commit | 0c5d3b838c935e6121bcee57b83fa802d7058cc1 (patch) | |
| tree | de206bf06d4f6fb280a427a2a907de93f0043bed /scene/resources | |
| parent | e5e1277ecd08f1f2980c9cd0490fb932efaa4678 (diff) | |
| parent | 644f73966002589c36d779fa33b9524a451f56e0 (diff) | |
Merge pull request #44199 from bruvzg/pvs_fixes_1
PVS-Studio static analyzer fixes
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/environment.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/resource_format_text.cpp | 1 | ||||
| -rw-r--r-- | scene/resources/surface_tool.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index 2ed5953b8f..1eb78a3679 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -591,7 +591,7 @@ void Environment::set_glow_level(int p_level, float p_intensity) { } float Environment::get_glow_level(int p_level) const { - ERR_FAIL_INDEX_V(p_level, RS::MAX_GLOW_LEVELS, false); + ERR_FAIL_INDEX_V(p_level, RS::MAX_GLOW_LEVELS, 0.0); return glow_levels[p_level]; } diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index cf8be8fe15..58645dbe65 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -704,7 +704,6 @@ ResourceLoaderText::ResourceLoaderText() { resources_total = 0; resource_current = 0; - use_sub_threads = false; progress = nullptr; lines = false; diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 3166067573..7899627048 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -74,7 +74,7 @@ bool SurfaceTool::Vertex::operator==(const Vertex &p_vertex) const { } } - for (int i = 0; i < RS::ARRAY_CUSTOM_MAX; i++) { + for (int i = 0; i < RS::ARRAY_CUSTOM_COUNT; i++) { if (custom[i] != p_vertex.custom[i]) { return false; } |