diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-19 11:20:11 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-27 13:07:16 +0300 |
| commit | 0d089ce88121f4bbdd93e9fd899d69ac7fba7a2a (patch) | |
| tree | e8830d53a2ea953e60e6d839bd59b60b9b24981d /intern/opensubdiv | |
| parent | 4ab36c4393cea18c4e4eff97bf011169b165ac91 (diff) | |
OpenSubdiv: Refactor, move edge map to base folder
Diffstat (limited to 'intern/opensubdiv')
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/base/edge_map.h (renamed from intern/opensubdiv/internal/opensubdiv_edge_map.h) | 6 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/topology/topology_refiner_capi.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index f4bfaf52df1..6c8275b5b60 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -51,6 +51,7 @@ if(WITH_OPENSUBDIV) list(APPEND SRC # Base. + internal/base/edge_map.h internal/base/memory.h # Device. @@ -78,7 +79,6 @@ if(WITH_OPENSUBDIV) internal/opensubdiv_util.cc internal/opensubdiv_converter_internal.h - internal/opensubdiv_edge_map.h internal/opensubdiv_evaluator_internal.h internal/opensubdiv_internal.h internal/opensubdiv_util.h diff --git a/intern/opensubdiv/internal/opensubdiv_edge_map.h b/intern/opensubdiv/internal/base/edge_map.h index 454068b58a4..eb70af2354c 100644 --- a/intern/opensubdiv/internal/opensubdiv_edge_map.h +++ b/intern/opensubdiv/internal/base/edge_map.h @@ -16,8 +16,8 @@ // // Author: Sergey Sharybin -#ifndef OPENSUBDIV_EDGE_MAP_H_ -#define OPENSUBDIV_EDGE_MAP_H_ +#ifndef OPENSUBDIV_BASE_EDGE_MAP_H_ +#define OPENSUBDIV_BASE_EDGE_MAP_H_ #include "internal/opensubdiv_util.h" @@ -159,4 +159,4 @@ template<> struct hash<blender::opensubdiv::EdgeKey> { } // namespace std -#endif // OPENSUBDIV_EDGE_MAP_H_ +#endif // OPENSUBDIV_BASE_EDGE_MAP_H_ diff --git a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc index 56d90b84632..36a6ed16b16 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc @@ -19,8 +19,8 @@ #include "opensubdiv_topology_refiner_capi.h" #include "MEM_guardedalloc.h" +#include "internal/base/edge_map.h" #include "internal/opensubdiv_converter_internal.h" -#include "internal/opensubdiv_edge_map.h" #include "internal/opensubdiv_internal.h" #include "internal/opensubdiv_util.h" #include "internal/topology/topology_refiner_impl.h" |