diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-19 11:49:41 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-05-27 13:07:16 +0300 |
| commit | 0ff665e4cedc74a81a3b657263a31ac8169a476f (patch) | |
| tree | bdd889d74be58b469079454925a359a4757061ea /intern | |
| parent | 4886a704b313e480edba8e250c38387b30669ea4 (diff) | |
OpenSubdiv: Refactor, move type conversion to base fodler
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/base/type_convert.cc (renamed from intern/opensubdiv/internal/opensubdiv_converter_internal.cc) | 2 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/base/type_convert.h (renamed from intern/opensubdiv/internal/opensubdiv_converter_internal.h) | 6 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/topology/topology_refiner_capi.cc | 2 | ||||
| -rw-r--r-- | intern/opensubdiv/internal/topology/topology_refiner_factory.cc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 90895cf6ed3..3afa90b04c9 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -53,6 +53,8 @@ if(WITH_OPENSUBDIV) # Base. internal/base/edge_map.h internal/base/memory.h + internal/base/type_convert.cc + internal/base/type_convert.h # Device. internal/device/device_context_cuda.cc @@ -78,10 +80,8 @@ if(WITH_OPENSUBDIV) internal/topology/topology_refiner_impl.h internal/opensubdiv.cc - internal/opensubdiv_converter_internal.cc internal/opensubdiv_util.cc - internal/opensubdiv_converter_internal.h internal/opensubdiv_util.h ) diff --git a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc b/intern/opensubdiv/internal/base/type_convert.cc index eedca88f77b..43412a66f33 100644 --- a/intern/opensubdiv/internal/opensubdiv_converter_internal.cc +++ b/intern/opensubdiv/internal/base/type_convert.cc @@ -20,7 +20,7 @@ # include <iso646.h> #endif -#include "internal/opensubdiv_converter_internal.h" +#include "internal/base/type_convert.h" #include <cassert> #include <opensubdiv/sdc/crease.h> diff --git a/intern/opensubdiv/internal/opensubdiv_converter_internal.h b/intern/opensubdiv/internal/base/type_convert.h index 7c586b0787a..52989a4bef9 100644 --- a/intern/opensubdiv/internal/opensubdiv_converter_internal.h +++ b/intern/opensubdiv/internal/base/type_convert.h @@ -16,8 +16,8 @@ // // Author: Sergey Sharybin -#ifndef OPENSUBDIV_CONVERTER_INTERNAL_H_ -#define OPENSUBDIV_CONVERTER_INTERNAL_H_ +#ifndef OPENSUBDIV_BASE_TYPE_CONVERT_H_ +#define OPENSUBDIV_BASE_TYPE_CONVERT_H_ #ifdef _MSC_VER # include <iso646.h> @@ -48,4 +48,4 @@ OpenSubdiv_FVarLinearInterpolation getCAPIFVarLinearInterpolationFromOSD( } // namespace opensubdiv } // namespace blender -#endif // OPENSUBDIV_CONVERTER_INTERNAL_H_ +#endif // OPENSUBDIV_BASE_TYPE_CONVERT_H_ diff --git a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc index 0363c874344..928fe49114e 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc @@ -20,7 +20,7 @@ #include "MEM_guardedalloc.h" #include "internal/base/edge_map.h" -#include "internal/opensubdiv_converter_internal.h" +#include "internal/base/type_convert.h" #include "internal/opensubdiv_util.h" #include "internal/topology/topology_refiner_impl.h" diff --git a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc index 05e4759c983..ae97797f214 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc @@ -27,7 +27,7 @@ #include <opensubdiv/far/topologyRefinerFactory.h> -#include "internal/opensubdiv_converter_internal.h" +#include "internal/base/type_convert.h" #include "internal/opensubdiv_util.h" #include "opensubdiv_converter_capi.h" |