Fixed NvCloth assets, NvCloth automated test scripts, ModelAsset cloning and UI reverse overrides menu crash (#3851)
- Fixed cloth asset, which stopped working due to Updated skeleton logic: #2957 which changes how fbx graph nodes are collected (affecting its names, which is used by cloth modifier). - Fixed cloth test suite active call to base's run_test function. It stopped working when its signature was changed here: 182d410#diff-3f5d93b0a76c838893693f19f2eacfe3e67040d445d6463c5c425ef5075cb409 - Renamed nvcloth TestSuite_Active.py to TestSuite_Main.py to be consistent with the other test folders. - Fixed ModelAsset creator clone function. It was missing to copy the material slots, ultimately causing Material Component to show 0 material slots. - Fixed crash where the revert overrides menu was not created when checking changes for selected component and selected entities. Signed-off-by: moraaar moraaar@amazon.com
This commit is contained in:
+16
-2
@@ -2352,6 +2352,13 @@ namespace AzToolsFramework
|
||||
{
|
||||
QMenu* revertMenu = nullptr;
|
||||
|
||||
auto addRevertMenu = [&menu]()
|
||||
{
|
||||
QMenu* revertOverridesMenu = menu.addMenu(tr("Revert overrides"));
|
||||
revertOverridesMenu->setToolTipsVisible(true);
|
||||
return revertOverridesMenu;
|
||||
};
|
||||
|
||||
//check for changes on selected property
|
||||
if (componentClassData)
|
||||
{
|
||||
@@ -2372,8 +2379,7 @@ namespace AzToolsFramework
|
||||
}
|
||||
|
||||
// Only add the "Revert overrides" menu option if it belongs to a slice
|
||||
revertMenu = menu.addMenu(tr("Revert overrides"));
|
||||
revertMenu->setToolTipsVisible(true);
|
||||
revertMenu = addRevertMenu();
|
||||
revertMenu->setEnabled(false);
|
||||
|
||||
if (fieldNode)
|
||||
@@ -2447,6 +2453,10 @@ namespace AzToolsFramework
|
||||
|
||||
if (isPartOfSlice && hasSliceChanges)
|
||||
{
|
||||
if (!revertMenu)
|
||||
{
|
||||
revertMenu = addRevertMenu();
|
||||
}
|
||||
revertMenu->setEnabled(true);
|
||||
|
||||
QAction* revertComponentAction = revertMenu->addAction(tr("Component"));
|
||||
@@ -2487,6 +2497,10 @@ namespace AzToolsFramework
|
||||
relevantEntities.push_back(id);
|
||||
}
|
||||
|
||||
if (!revertMenu)
|
||||
{
|
||||
revertMenu = addRevertMenu();
|
||||
}
|
||||
revertMenu->setEnabled(true);
|
||||
QAction* revertAction = revertMenu->addAction(QObject::tr("Entity"));
|
||||
revertAction->setToolTip(QObject::tr("This will revert all component properties on this entity to the last saved."));
|
||||
|
||||
Reference in New Issue
Block a user