diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
commit | 5aedae5aa9251e1216d7bc1652cb1f451dd047c1 (patch) | |
tree | 1e3c00ccac6cb4082d8bd3e52f047f8cbc058b61 /src/render/renderers/opengl/renderer/renderviewbuilder.cpp | |
parent | 532e108a3abf56aa0ef709af5049ce3b2161ed84 (diff) | |
parent | df5a63b059956e8a717db9110327cc86612cc934 (diff) |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Ia93046662955494eccd3f4da80f015fe5148b026
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderviewbuilder.cpp')
-rw-r--r-- | src/render/renderers/opengl/renderer/renderviewbuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp index 8f1b17119..4034af146 100644 --- a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp +++ b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp @@ -326,8 +326,8 @@ public: filteredCommandData->reserve(renderableEntities.size()); // Because dataCacheForLeaf.renderableEntities or computeEntities are sorted // What we get out of EntityRenderCommandData is also sorted by Entity - auto eIt = std::cbegin(renderableEntities); - const auto eEnd = std::cend(renderableEntities); + auto eIt = renderableEntities.cbegin(); + const auto eEnd = renderableEntities.cend(); int cIt = 0; const int cEnd = commandData.size(); |