diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-20 16:42:06 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-20 16:42:51 +0300 |
| commit | 63d71edfcabbb3a8c58326adad7a51644a0e550a (patch) | |
| tree | e52b886fa306576b224bb1700b7de470e19785c5 /source/blender/collada | |
| parent | c31f24c63b875e8c9a7cacd2733d3e8614eff74d (diff) | |
Fix collada build after gawain rename/refactor
Collada files should not have been touched.
Bug introduced on: c31f24c63b875e8c9a7cacd2733d3e8614eff74d
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 402534a8e4c..9c95d4de695 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -67,7 +67,7 @@ static const std::string bc_get_dae_name(T *node) return node->getName().size() ? node->getName(): node->getOriginalId(); } -static const char *bc_primTypeToStr(COLLADAFW::MeshPrimitive::Gwn_PrimType type) +static const char *bc_primTypeToStr(COLLADAFW::MeshPrimitive::PrimitiveType type) { switch (type) { case COLLADAFW::MeshPrimitive::LINES: @@ -274,7 +274,7 @@ bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh) // checks if mesh has su for (unsigned i = 0; i < prim_arr.getCount(); i++) { COLLADAFW::MeshPrimitive *mp = prim_arr[i]; - COLLADAFW::MeshPrimitive::Gwn_PrimType type = mp->getPrimitiveType(); + COLLADAFW::MeshPrimitive::PrimitiveType type = mp->getPrimitiveType(); const char *type_str = bc_primTypeToStr(type); |