Updated to CL 22627414:

* docs updates
* authoring fixes
* stress solver crash fixes

3 files changed, 10 insertions, 16 deletions

diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl b/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl
index bb22204..ad959ec 100644
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl
+++ b/tools/ArtistTools/source/BlastPlugin/Parameters/BlastProjectParams.pl
@@ -1060,26 +1060,21 @@
 					hints => { shortDescription => "Is this blast asset export FBX" },
 				},
 				{
-					name => 'obj',
-					type => 'STRING',
-					hints => { shortDescription => "OBJ export asset path" },
-				},
-				{
-					name => 'exportOBJ',
+					name => 'embedFBXCollision',
 					type => 'BOOL',
 					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export OBJ" },
+					hints => { shortDescription => "Whether embed collisio in export FBX" },
 				},
 				{
-					name => 'collision',
+					name => 'obj',
 					type => 'STRING',
-					hints => { shortDescription => "Collision export asset path" },
+					hints => { shortDescription => "OBJ export asset path" },
 				},
 				{
-					name => 'exportCollision',
+					name => 'exportOBJ',
 					type => 'BOOL',
 					defaultValue => 'false',
-					hints => { shortDescription => "Is this blast asset export Collision" },
+					hints => { shortDescription => "Is this blast asset export OBJ" },
 				},
 				{
 					name => 'llasset',
diff --git a/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp b/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp
index 6017a75..5cd0a32 100644
--- a/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp
+++ b/tools/ArtistTools/source/BlastPlugin/Parameters/HackNvParamBug.cpp
@@ -9,6 +9,8 @@ int GetHackElementSize(const char* data)
 		return sizeof(nvidia::NvVec3);
 	if (strstr(data, "graphicsMesh.normals") != nullptr)
 		return sizeof(nvidia::NvVec3);
+	if (strstr(data, "graphicsMesh.tangents") != nullptr)
+		return sizeof(nvidia::NvVec3);
 	if (strstr(data, "graphicsMesh.texcoords") != nullptr)
 		return sizeof(nvidia::NvVec2);
 	if (strstr(data, "graphicsMesh.positionIndexes") != nullptr)
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;