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/toolkit/source/NvBlastTkFamilyImpl.h | |
| 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/toolkit/source/NvBlastTkFamilyImpl.h')
| -rw-r--r-- | sdk/toolkit/source/NvBlastTkFamilyImpl.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sdk/toolkit/source/NvBlastTkFamilyImpl.h b/sdk/toolkit/source/NvBlastTkFamilyImpl.h index 577326b..7210f0a 100644 --- a/sdk/toolkit/source/NvBlastTkFamilyImpl.h +++ b/sdk/toolkit/source/NvBlastTkFamilyImpl.h @@ -82,10 +82,6 @@ public: virtual const TkAsset* getAsset() const override; virtual void reinitialize(const NvBlastFamily* newFamily, TkGroup* group) override; - - virtual const void* getMaterial() const override; - - virtual void setMaterial(const void* material) override; // End TkFamily // Public methods @@ -145,7 +141,6 @@ private: Array<JointSet*>::type m_jointSets; FamilyIDMap m_familyIDMap; const TkAssetImpl* m_asset; - const void* m_material; TkEventQueue m_queue; }; @@ -187,18 +182,6 @@ NV_INLINE TkActorImpl* TkFamilyImpl::getActorByActorLL(const NvBlastActor* actor } -NV_INLINE const void* TkFamilyImpl::getMaterial() const -{ - return m_material; -} - - -NV_INLINE void TkFamilyImpl::setMaterial(const void* material) -{ - m_material = material; -} - - NV_INLINE Array<TkActorImpl>::type& TkFamilyImpl::getActorsInternal() { return m_actors; |