ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

GCC 4.4 compatibility: explicit std::reference_wrapper constructor.

Vladimír Vondruš 12 years ago
parent
35d0ef2e2c
commit
518ea9dfb2
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/MagnumPlugins/ObjImporter/ObjImporter.cpp

6
src/MagnumPlugins/ObjImporter/ObjImporter.cpp
Unescape View File

@ -424,9 +424,9 @@ std::optional<MeshData3D> ObjImporter::doMesh3D(UnsignedInt id) {
if(!normalIndices.empty() || !textureCoordinateIndices.empty()) { if(!normalIndices.empty() || !textureCoordinateIndices.empty()) {
std::vector<std::reference_wrapper<std::vector<UnsignedInt>>> arrays; std::vector<std::reference_wrapper<std::vector<UnsignedInt>>> arrays;
arrays.reserve(3); arrays.reserve(3);
arrays.push_back(positionIndices); arrays.push_back(std::ref(positionIndices));
if(!normalIndices.empty()) arrays.push_back(normalIndices); if(!normalIndices.empty()) arrays.push_back(std::ref(normalIndices));
if(!textureCoordinateIndices.empty()) arrays.push_back(textureCoordinateIndices); if(!textureCoordinateIndices.empty()) arrays.push_back(std::ref(textureCoordinateIndices));
indices = MeshTools::combineIndexArrays(arrays); indices = MeshTools::combineIndexArrays(arrays);
/* Reindex data arrays */ /* Reindex data arrays */

Write Preview
Loading…
Cancel
Save