diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:38:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:44:18 +0300 |
| commit | 2e2e7aff7cb28337684534d2207816946407788b (patch) | |
| tree | 14da1dfc59a2638b28cd12aeea70698e89c97235 /source/blender/alembic | |
| parent | cc397b918ff1b2a51b3b82367506eb7684860cea (diff) | |
| parent | 885cc4cf9a1d5c167e4cbd26c3294d8b1ad400d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_customdata.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc index 87545007870..f2ae1c831d1 100644 --- a/source/blender/alembic/intern/abc_customdata.cc +++ b/source/blender/alembic/intern/abc_customdata.cc @@ -26,14 +26,7 @@ #include <Alembic/AbcGeom/All.h> #include <algorithm> - -#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1900) #include <unordered_map> -typedef std::unordered_map<uint64_t, int> uv_index_map; -#else -#include <map> -typedef std::map<uint64_t, int> uv_index_map; -#endif extern "C" { #include "DNA_customdata_types.h" @@ -60,6 +53,8 @@ using Alembic::AbcGeom::OV2fGeomParam; using Alembic::AbcGeom::OC4fGeomParam; +typedef std::unordered_map<uint64_t, int> uv_index_map; + static inline uint64_t uv_to_hash_key(Imath::V2f v) { /* Convert -0.0f to 0.0f, so bitwise comparison works. */ |