diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-03 12:45:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-03 12:45:20 +0100 |
| commit | 467f18b738d0eabf57f6dddf333869a155b6906a (patch) | |
| tree | 66f018ee2954f1acb9c3a37653be546b98441446 | |
| parent | c0e1c66e3def1383fb373454fe98de228b153159 (diff) | |
Fix style issues from recent commits
| -rw-r--r-- | drivers/windows/dir_access_windows.cpp | 1 | ||||
| -rw-r--r-- | scene/resources/animation.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index c5f078ccfb..2f705ec87d 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -353,7 +353,6 @@ String DirAccessWindows::get_filesystem_type() const { ERR_FAIL_COND_V(unit_end == -1, String()); String unit = path.substr(0, unit_end + 1) + "\\"; - WCHAR szVolumeName[100]; WCHAR szFileSystemName[10]; DWORD dwSerialNumber = 0; diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 047790cbde..3eb16c544c 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1839,7 +1839,7 @@ void Animation::_value_track_get_key_indices_in_range(const ValueTrack *vt, floa to_time = length * 1.001; //include a little more if at the end int to = _find(vt->values, to_time); - if (to>=0 && from_time == to_time && vt->values[to].time==from_time) { + if (to >= 0 && from_time == to_time && vt->values[to].time == from_time) { //find exact (0 delta), return if found p_indices->push_back(to); return; diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index 2b5afb9cdd..85dcaa6b03 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -759,7 +759,7 @@ void VisualServerCanvas::canvas_item_add_triangle_array(RID p_item, const Vector ERR_FAIL_COND(!canvas_item); int vertex_count = p_points.size(); - ERR_FAIL_COND(vertex_count==0); + ERR_FAIL_COND(vertex_count == 0); ERR_FAIL_COND(!p_colors.empty() && p_colors.size() != vertex_count && p_colors.size() != 1); ERR_FAIL_COND(!p_uvs.empty() && p_uvs.size() != vertex_count); ERR_FAIL_COND(!p_bones.empty() && p_bones.size() != vertex_count * 4); |