diff options
| author | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
|---|---|---|
| committer | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
| commit | b0c11962f6012430da3bcaa2727288046b33d648 (patch) | |
| tree | cf13338fa4fd7072badf64f751f94abeeb437003 /sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp | |
| parent | linux build fix - all configs (diff) | |
| download | blast-b0c11962f6012430da3bcaa2727288046b33d648.tar.xz blast-b0c11962f6012430da3bcaa2727288046b33d648.zip | |
Changes for 1.1.1
See README.md
Diffstat (limited to 'sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp')
| -rw-r--r-- | sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp b/sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp index 948cd84..45e60d5 100644 --- a/sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp +++ b/sdk/extensions/physx/source/physics/NvBlastExtPxAssetImpl.cpp @@ -52,8 +52,9 @@ namespace Blast /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ExtPxAssetImpl::ExtPxAssetImpl(const ExtPxAssetDesc& desc, TkFramework& framework) + : m_accelerator(nullptr) #if !defined(NV_VC) || NV_VC >= 14 - : m_defaultActorDesc { 1.0f, nullptr, 1.0f, nullptr } + , m_defaultActorDesc { 1.0f, nullptr, 1.0f, nullptr } { #else { @@ -65,8 +66,9 @@ ExtPxAssetImpl::ExtPxAssetImpl(const ExtPxAssetDesc& desc, TkFramework& framewor } ExtPxAssetImpl::ExtPxAssetImpl(const TkAssetDesc& desc, ExtPxChunk* pxChunks, ExtPxSubchunk* pxSubchunks, TkFramework& framework) + : m_accelerator(nullptr) #if !defined(NV_VC) || NV_VC >= 14 - : m_defaultActorDesc{ 1.0f, nullptr, 1.0f, nullptr } + , m_defaultActorDesc{ 1.0f, nullptr, 1.0f, nullptr } { #else { @@ -79,6 +81,7 @@ ExtPxAssetImpl::ExtPxAssetImpl(const TkAssetDesc& desc, ExtPxChunk* pxChunks, Ex ExtPxAssetImpl::ExtPxAssetImpl(TkAsset* asset, ExtPxAssetDesc::ChunkDesc* chunks, uint32_t chunkCount) : m_tkAsset(asset) + , m_accelerator(nullptr) #if !defined(NV_VC) || NV_VC >= 14 , m_defaultActorDesc{ 1.0f, nullptr, 1.0f, nullptr } { @@ -94,6 +97,7 @@ ExtPxAssetImpl::ExtPxAssetImpl(TkAsset* asset, ExtPxAssetDesc::ChunkDesc* chunks ExtPxAssetImpl::ExtPxAssetImpl(TkAsset* asset) : m_tkAsset(asset) + , m_accelerator(nullptr) #if !defined(NV_VC) || NV_VC >= 14 , m_defaultActorDesc { 1.0f, nullptr, 1.0f, nullptr } { |