aboutsummaryrefslogtreecommitdiff
path: root/samples/SampleBase/scene/SceneController.cpp
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2017-08-28 13:55:34 -0700
committerBryan Galdrikian <[email protected]>2017-08-28 13:55:34 -0700
commit1e887d827e65a084a0ad0ba933c61a8330aeee07 (patch)
tree1e2aab418dadd37f5dc0aae4d8b00e81d909fd24 /samples/SampleBase/scene/SceneController.cpp
parentRemoving ArtistTools and CurveEditor projects (diff)
downloadblast-1e887d827e65a084a0ad0ba933c61a8330aeee07.tar.xz
blast-1e887d827e65a084a0ad0ba933c61a8330aeee07.zip
Candidate 1.1 release.
* SampleAssetViewer now unconditionally loads the commandline-defined asset. * Better error handling in AuthoringTool (stderr and user error handler). * More consistent commandline switches in AuthoringTool and ApexImporter (--ll, --tx, --px flags). * NvBlastExtAuthoring ** Mesh cleaner, tries to remove self intersections and open edges in the interior of a mesh. ** Ability to set interior material to existing (external) material, or a new material id. ** Material ID remapping API. ** Rotation of voronoi cells used for fracturing. * Fixed smoothing groups in FBX exporter code. * Impulse passing from parent to child chunks fixed. * Reading unskinned fbx meshes correctly. * Collision hull generation from fbx meshes fixed. * Win32/64 PerfTest crash fix.
Diffstat (limited to 'samples/SampleBase/scene/SceneController.cpp')
-rw-r--r--samples/SampleBase/scene/SceneController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/SampleBase/scene/SceneController.cpp b/samples/SampleBase/scene/SceneController.cpp
index 390682c..2bcfca9 100644
--- a/samples/SampleBase/scene/SceneController.cpp
+++ b/samples/SampleBase/scene/SceneController.cpp
@@ -1189,7 +1189,7 @@ void SceneController::onSampleStart()
}
// add both asset file and asset list from config
- addAssets(config.additionalAssetList, packmanResourcesAdded);
+ addAssets(config.additionalAssetList, true); // only used for command line assets
addAssets(assetList, packmanResourcesAdded);
// prepare scene