Merge branch 'develop' into feature/wrap-modes
This commit is contained in:
commit
edfbac122c
@ -44,6 +44,13 @@ freely, subject to the following restrictions:
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined SWIG
|
||||||
|
//Do nothing in this case
|
||||||
|
#else
|
||||||
|
#undef POLYVOX_DEPRECATED
|
||||||
|
#define POLYVOX_DEPRECATED //Define it to nothing to avoid warnings
|
||||||
|
#endif
|
||||||
|
|
||||||
// Now we use the generic helper definitions above to define POLYVOX_API and POLYVOX_LOCAL.
|
// Now we use the generic helper definitions above to define POLYVOX_API and POLYVOX_LOCAL.
|
||||||
// POLYVOX_API is used for the public API symbols. It either imports or exports (or does nothing for static build)
|
// POLYVOX_API is used for the public API symbols. It either imports or exports (or does nothing for static build)
|
||||||
// POLYVOX_LOCAL is used for non-api symbols.
|
// POLYVOX_LOCAL is used for non-api symbols.
|
||||||
|
@ -31,7 +31,7 @@ namespace PolyVox
|
|||||||
RawVolume<VoxelType>::RawVolume(const Region& regValid)
|
RawVolume<VoxelType>::RawVolume(const Region& regValid)
|
||||||
:BaseVolume<VoxelType>(regValid)
|
:BaseVolume<VoxelType>(regValid)
|
||||||
{
|
{
|
||||||
setBorderValue(VoxelType());
|
this->setBorderValue(VoxelType());
|
||||||
|
|
||||||
//Create a volume of the right size.
|
//Create a volume of the right size.
|
||||||
initialise(regValid);
|
initialise(regValid);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user