forked from bartvdbraak/blender
OpenSubdiv: Refactor, move type conversion to base fodler
This commit is contained in:
parent
4886a704b3
commit
0ff665e4ce
@ -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
|
||||
)
|
||||
|
||||
|
@ -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>
|
@ -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_
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user