diff options
| author | Anton Novoselov <[email protected]> | 2017-08-08 20:14:22 +0300 |
|---|---|---|
| committer | Anton Novoselov <[email protected]> | 2017-08-08 20:14:22 +0300 |
| commit | d41654b469fa51870b5952c836c04d9da17f32d3 (patch) | |
| tree | 64f8f437eef394630355f281d35ca1d53e5c4d6c /tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp | |
| parent | add +x for packman script (diff) | |
| download | blast-d41654b469fa51870b5952c836c04d9da17f32d3.tar.xz blast-d41654b469fa51870b5952c836c04d9da17f32d3.zip | |
Updated to CL 22627414:
* docs updates
* authoring fixes
* stress solver crash fixes
Diffstat (limited to 'tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp')
| -rw-r--r-- | tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp b/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp index ebe8f3d..3f97631 100644 --- a/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp +++ b/tools/ArtistTools/source/BlastPlugin/Parameters/ProjectParams.cpp @@ -130,7 +130,6 @@ void freeBlast(BPPAsset& data) freeString(data.name); freeString(data.fbx); freeString(data.obj); - freeString(data.collision); freeString(data.llasset); freeString(data.tkasset); freeString(data.bpxa); @@ -732,13 +731,12 @@ void copy(BPPAsset& dest, BPPAsset& source) copy(dest.activeUserPreset, source.activeUserPreset); copy(dest.fbx, source.fbx); copy(dest.obj, source.obj); - copy(dest.collision, source.collision); copy(dest.llasset, source.llasset); copy(dest.tkasset, source.tkasset); copy(dest.bpxa, source.bpxa); dest.exportFBX = source.exportFBX; + dest.embedFBXCollision = source.embedFBXCollision; dest.exportOBJ = source.exportOBJ; - dest.exportCollision = source.exportCollision; dest.exportLLAsset = source.exportLLAsset; dest.exportTKAsset = source.exportTKAsset; dest.exportBPXA = source.exportBPXA; @@ -1471,13 +1469,12 @@ void init(BPPAsset& param) init(param.stressSolver); param.obj.buf = nullptr; param.fbx.buf = nullptr; - param.collision.buf = nullptr; param.llasset.buf = nullptr; param.tkasset.buf = nullptr; param.bpxa.buf = nullptr; param.exportFBX = false; + param.embedFBXCollision = true; param.exportOBJ = false; - param.exportCollision = false; param.exportLLAsset = false; param.exportTKAsset = false; param.exportBPXA = false; |