diff options
| author | bgaldrikian <[email protected]> | 2020-10-08 22:01:09 -0700 |
|---|---|---|
| committer | bgaldrikian <[email protected]> | 2020-10-08 22:01:09 -0700 |
| commit | c389ca2d86ed528e4d54941378a4752ca74026e8 (patch) | |
| tree | 271dba95c84f62d13bcebbc62b5dcdc5b7ff443e /sdk/extensions/exporter/source | |
| parent | * NvBlastAsset::testForValidChunkOrder (used when creating an NvBlastAsset) i... (diff) | |
| download | blast-1.1.6_release.tar.xz blast-1.1.6_release.zip | |
* Updated license filev1.1.6_releasev1.1.6_rc1
* Updated copyright dates
* Removed ArtistTool
* Pulled request #15 "Fix Blast bond generation"
* Pulled request #16 "Fix invalid pointer access in authoring tools"
Diffstat (limited to 'sdk/extensions/exporter/source')
12 files changed, 14 insertions, 14 deletions
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporter.cpp b/sdk/extensions/exporter/source/NvBlastExtExporter.cpp index 790d408..0e67a75 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporter.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporter.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "NvBlastExtExporter.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.cpp index 22503d3..4939d28 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "NvBlastExtExporterFbxReader.h"
#include "NvBlastExtExporterFbxUtils.h"
@@ -198,9 +198,9 @@ void FbxFileReader::loadFromFile(const char* filename) bool bAllTriangles = mesh->IsTriangleMesh();
if (!bAllTriangles)
{
- //It creates corrupted mesh and return true. Disable it to prevent crash.
//try letting the FBX SDK triangulate it
- //bAllTriangles = geoConverter.Triangulate(mesh, true) && mesh->IsTriangleMesh();
+ mesh = FbxCast<FbxMesh>(geoConverter.Triangulate(mesh, true));
+ bAllTriangles = mesh->IsTriangleMesh();
}
int polyCount = mesh->GetPolygonCount();
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.h b/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.h index 061e603..14ab6e0 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.h +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxReader.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#ifndef NVBLASTEXTEXPORTERFBXREADER_H
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.cpp index 4bd996b..7f679fe 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "fbxsdk.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.h b/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.h index ca5b3a2..590b142 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.h +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxUtils.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#ifndef NVBLASTEXTEXPORTERFBXUTILS_H
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.cpp index 540e9de..1c78ea8 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "fbxsdk.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.h b/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.h index ad61fd5..d7c69f9 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.h +++ b/sdk/extensions/exporter/source/NvBlastExtExporterFbxWriter.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#ifndef NVBLASTEXTEXPORTERFBXWRITER_H
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterJsonCollision.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterJsonCollision.cpp index a9da985..2a185e3 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterJsonCollision.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterJsonCollision.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "NvBlastExtExporterJsonCollision.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.cpp index 9d44947..6e50406 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "NvBlastExtExporterObjReader.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.h b/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.h index 0f3e843..95fbd09 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.h +++ b/sdk/extensions/exporter/source/NvBlastExtExporterObjReader.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#ifndef NVBLASTEXTEXPORTEROBJREADER_H
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.cpp b/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.cpp index 3cd8c62..44f580c 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.cpp +++ b/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.cpp @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#include "NvBlastExtExporterObjWriter.h"
diff --git a/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.h b/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.h index 7685ea2..439586c 100755 --- a/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.h +++ b/sdk/extensions/exporter/source/NvBlastExtExporterObjWriter.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2018 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2020 NVIDIA Corporation. All rights reserved.
#ifndef NVBLASTEXTEXPORTEROBJWRITER_H
|