merge from development

Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-10 17:23:25 +00:00
parent 36285aa834 6791b652cc
commit 2ad3cb770b
429 changed files with 11108 additions and 5963 deletions
@@ -60,6 +60,7 @@ namespace PhysX
                        "Specifies the PhysX mesh collider asset for this PhysX collider component.")
                        ->Attribute(AZ_CRC_CE("EditButton"), "")
                        ->Attribute(AZ_CRC_CE("EditDescription"), "Open in Scene Settings")
+                        ->Attribute(AZ_CRC_CE("DisableEditButtonWhenNoAssetSelected"), true)
                    ->DataElement(AZ::Edit::UIHandlers::Default, &EditorProxyAssetShapeConfig::m_configuration, "Configuration",
                        "PhysX mesh asset collider configuration.")
                        ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);