Stabilization/2310 @ 9f9829b -> Development (o3de#16844)

* Enable the DPE by default

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Fixed asset picker automated test with DPE enabled

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* type fixing for WrapperType

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fixes from code review

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Fix missing support for multi-collider articulation links (o3de#16713)

* Fix missing support for multi-collider articulation links
* Adjust to review
---------
Signed-off-by: Michał Pełka <michal.pelka@robotec.ai>

* addressing PR feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressed tweaks and nitpicks

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing more feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* adjusted spacing

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* addressing chgalvan's feedback

Signed-off-by: TJ Kotha <tankotha@amazon.com>

* Skip test that is intermittently failing with DPE enabled

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Fix for failing to open text files when running from a snap install (o3de#16717)

* Fix for failing to open text files when running from a snap install

- Update Linux Qt packages to use the fixed revision (rev9) that fixes the snap/open local file issue
- Corrected use of `QUrl("file:///" + ` with the correct way: `QUrl("file:///" + `
- Added warning logs in Project Manager in case QDesktopServices::openUrl(<local file>) fails.
- Fix error causing 'show logs' not to work

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* fix for opaque wrapper types (o3de#16732)

* type fixing for WrapperType

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fixes from code review

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

---------

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* turn on override support in the Inspector by default

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Fixed crash in DPE due to events being sent to widgets that have been deleted

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* remove unnecessary overrides, revert to new default

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Material Canvas: Updating material graph shaders to not optimize out material SRG

This change updates the material graph template material SRGs to include a placeholder variable. Including and referencing this variable ensures that the material SRG always exists across all shaders that might use it. This initial resolved one assert that triggered when adding or removing material inputs from a material graph, consequently adding or removing variables from the material SRG and corresponding connections in the material type. As the AP processes the material and shader changes, the runtime may receive individual shader updates with inconsistent SRG data until everything is fully compiled and synchronized.

This change may be reverted after subsequent changes that may also address the issue.

Relates to o3de#16034
Relates to o3de#16735
Relates to o3de#14772

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 16376e4)
(cherry picked from commit a3cbcbb)

* Material Canvas: Create new material instance in viewport after changes

This change updates the material assignment class with a flag to force it to create a new material instance regardless of property overrides. The material canvas viewport uses this flag to guarantee the most recent version of the material asset and instance are reflected in the viewport.

Relates to o3de#16034

Relates to o3de#16735

Relates to o3de#14772

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 07df9b3)
(cherry picked from commit 2275cee)

* Material Canvas: Option to delete previously generated files before creating new ones

This change provides an option to delete files that were previously generated using the current template before creating new ones. The option was useful while debugging and may also be useful if switching between different material output nodes that might use the same file names. The option is disabled by default.

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 015e007)
(cherry picked from commit fcdd7ee)

* updating display name and tooltip for delete generated files option

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 8888dff)
(cherry picked from commit 8bc6015)

* Update shader and SRG instance ID creation functions

This change updates these functions to generate unique instance IDs that take the content or the version of the data into account. The asset data pointer is used to make the value more unique, relative to the asset, but could be replaced with some other explicit version value or a hash of the data. Ensuring that the instance ID is unique relative to the version of the data will permit new instances to be created or new versions of the asset with the same asset ID.

Relates to o3de#16034

Relates to o3de#16735

Relates to o3de#14772

Relates to https://github.com/o3de/o3de/issues/15794’

Signed-off-by: gadams3 <guthadam@amazon.com>

* Converted instance ID data byte array to structure after PR feedback

Signed-off-by: gadams3 <guthadam@amazon.com>

* Changing shader resource group instance ID generation to only use the shader resource group name and layout hashes

Signed-off-by: gadams3 <guthadam@amazon.com>

* Renaming instance ID function to MakeSRGPoolInstanceId

Signed-off-by: gadams3 <guthadam@amazon.com>

* Reverting material related changes from this PR and moving to separate PR

Signed-off-by: gadams3 <guthadam@amazon.com>

* Reverting but cleaning up changes to make instance ID for shader resource group pool

Signed-off-by: gadams3 <guthadam@amazon.com>

* Fixed unit tests after enabling prefab overrides

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Change PR checklist GHA event type (o3de#16765)

* Fixing warning as error caused by unused variable

Signed-off-by: gadams3 <guthadam@amazon.com>

* Correcting spelling of "Default" in material component

Signed-off-by: gadams3 <guthadam@amazon.com>

* Restored function within correct spelling and added deprecation notice

Signed-off-by: gadams3 <guthadam@amazon.com>

* SMC: Allow access to generated shaders and materials in intermediate assets folder

Replaced explicit checks for ignoring the cache folder with configurable settings so that SMC could access generated shaders and materials

Signed-off-by: gadams3 <guthadam@amazon.com>

* Changed the ignored paths pattern settings to use regular expressions.
Added a faster, direct setting for ignoring the cache holder.
Added the ignore cache folder setting to the settings dialog.
Added a settings registry handler to monitor changes to the new settings and update the asset browser.

Signed-off-by: gadams3 <guthadam@amazon.com>

* Atom tools, SMC, MC: Atom tools asset browser support for extension based file filters

SMC, MC, and other tools work primarily with source files that are not directly tied to asset types. This change implements support in the atom tools asset browser for setting up extension based file filters in lieu of the asset group based filters.

Signed-off-by: gadams3 <guthadam@amazon.com>

* Updating comments and adding switch statement braces per PR feedback

Signed-off-by: gadams3 <guthadam@amazon.com>

* fixed a few opaque types, where possible

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Fix reading of the GenericValueList values that contain enums

The GenericValueListAttributeDefinition has been updated to use the
`Dom::Utils::ValueFromType` function to properly read the attribute from
a Dom::Value

The GenericComboBoxCtrl::ConsumeAttribute reading of the
GenericValueList attribute has been updated to try to read a vector of every integer type `AZStd::pair<int-type, AZStd::string>` type.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating material canvas asset status reporting to be non blocking with multiple documents open simultaneously

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit d1db120)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Removing asset handling from material class that reported success even though the class has not been initialized

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 7a7a7c3)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* updated erroneous comments in graph view

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit c34dcb7)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Fix missing texture reference

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit e9302d7)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Centralized logic and settings for deleting previously generated files

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit b3cf1c0)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Updating comments for registering shader source data document

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 6a0e647)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Restoring settings to clear viewport material when graph compilation starts

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 2820309)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Updated comments

Signed-off-by: gadams3 <guthadam@amazon.com>

updating messaging to make assets less acidic

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit c1bec42)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Updating comments

Signed-off-by: gadams3 <guthadam@amazon.com>
(cherry picked from commit 29a623a)
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* removing reverted changes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* This change fix a diffuse probe grid bake issue with pc which doesn't support raytracing (o3de#16733)

* This change fix a diffuse probe grid bake issue with pc which doesn't support raytracing

Signed-off-by: VickyAtAZ <55564570+VickyAtAZ@users.noreply.github.com>
Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed comparison of file paths with '.' using the AZ Path API (o3de#16674) (o3de#16798)

Windows Paths such as `C:/foo/bar/./baz` now correctly compare equal to
`C:/foo/bar/baz` and POSIX paths such as `/baz/bar/./foo` now compare
equal to `/baz/bar/foo`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for atom tools not launching with all gems enabled

All of the atom tools that run independently of the main editor have registry settings to disable specific gems within those tools.
This is done to speed up launch times and reduce memory utilization by not loading or activating systems that will never be used within those tools.
Occasionally, a new gem is added or activated that may depend on one of the disabled gem modules.
In this case, the virtual game pad was activated by the game project and relied upon ly shine, which is disabled by those tools.
So the virtual game pad was added to the disabled list.
Alternatively, the auto load or disabled gem registry settings files can be completely removed to let all of the project runtime dependencies load in the tools.
I attempted this but certain project specific gems, like those from the multiplayer sample, will still need to be disabled.
Script canvas will also need to be disabled because it fires several errors and warnings while, I assume, trying to load graph data.

Signed-off-by: gadams3 <guthadam@amazon.com>

* made a new CVar for AssetEditor DPE support (o3de#16782)

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Disable o3de-extras automated testing for stabilization (o3de#16801)

Signed-off-by: Mike Chang <changml@amazon.com>

* Update the splash screen for o3de editor. (o3de#16812)

Signed-off-by: VickyAtAZ <55564570+VickyAtAZ@users.noreply.github.com>

* Fixed prefab overrides not working with DPE enabled

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Fix DPE resizing on Linux (o3de#16813)

* made a new CVar for AssetEditor DPE support

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix for Linux DPEs not automatically resizing

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

---------

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Document Property Editor Slider fixes (o3de#16814)

* DOM ValueFromType and ValueToType json serialization support

The DomUtils.h/.cpp `ValueFromType` and `ValueToType` functions have
been updated to use the JSON Serialization system when possible to
convert an `AZ::Dom::Value` to/from a C++ type.

This is the preferred way to store a aggregate type into
`AZ::Dom::Value` as it maintains the C++/C object structure in a Dom
Object/Array structure.

If the type doesn't support JSON Serialization, then it fallback to
being stored using an `AZStd::any` inside of the Dom::Value as an opaque
type.
The limitations of using an opaque type, is that there is no support for
comparing two `AZStd::any` objects to each other.
The only way for comparison, is the compare the address where the
`AZStd::any` objects are stored.

Due to that, the Dom::Value::operator= and AZ::DeepCompareIsEqual can
only compare the internal `AZStd::shared_ptr<AZStd::any>` instance
memory address to compare if two opaque types are equal and not a deep
compare of the fields of the stored aggregate type.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding an `IsTypeSerializable` impl for JsonSerialization

The `IsTypeSerializable` function checks if an AZ TypeId has either a
serializer registered with the Json Registration Context or is reflected
to the SerializeContext.

This allows checking to see if a type can be serialized before calling
either `JsonSerialization::Load` or `JsonSerialization::Store`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added check for serializability to the Dom Value <-> Json Serialization functions

The Dom Utils `LoadViaJsonSerialization` and `StoreViaJsonSerialization`
functions now check if the AZ TypeId is reflected with either the
JsonRegistrationContext or SerializeContext before attempting to use the
Json Serialization system to marshal a Dom Value to/from a C++ object.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* The Dom Patch creation logic now performs a deep compare of array fields

Because the Dom Patch creation did not perform a deep compare previously
of it's fields, any Node, Object or Array fields contained within an
Array field performed a pointer comparison between the shared_ptr
address containing those objects, instead of comparing the properties
and children of those complex types.

Therefore patch changes were generated for Dom entrys that were
value-equivalent, but not address equivalent.

This would cause Node children such as Labels fields to compare unequal,
even when the label string was equivalent.

fixes o3de#16742

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding a Json Serializer for the EditContext EnumConstant

With an JsonSerializer for the EditContext EnumConstant, it is now
possible to marshal an enum constant to a `Dom::Value` using Json
Serialization.
Therefore the `Dom::Value` would store an "Object" instead of an
"OpaqueType" which is comparable without a value hash.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed the DOM Utils `ValueToType` function Json Serialization flow

By default using JsonSerialization doesn't store full default values to
the serialized rapidjson object, so only the non-default value fields
were being added to the Dom::Values

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the Dom Utils MarshalOpaqueValue and ValueToType functions to
use a no-op Json issue reporter callback to prevent log spam to the
Editor console.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Modified the ReflectionAdapter `VisitObjectBegin` function
`StoreValueIntoPointer` lambda to account for marshaling Dom ObjectTypes

The `StoreValueIntoPointer` value was only accounting for visiting
pointers to C++ types through the TryMarshalValueToPointer function
call.

Now that the Dom Utils `ValueFromType` function has been updated to
write C++ structs using Json Serialization to the Dom::Value when
possible, the scenario where a Dom::Value which is an "Object" is being
visited.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved `TryMarshalValueToPointer` logic earlier in the ExtractOpaqueValue lambda

The flow now attempts to check if the Dom::Value is a Dom::Object which
has a pointer field that can be deserialized first.
If that fails, then the JSON Serialization system is used to load Dom
Value object into a C++ type.

This is needed as the AssetJsonSerializer needs to suceed in its
deserialization operation, when all the relavant asset fields are
missing such as the "assetId" field.

The result of the operation indicates that JSON Serialization
has used the default value to intialize the Asset.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the SetValueFromDom function to always use ValueToType.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Update Code/Framework/AzCore/AzCore/DOM/DomUtils.cpp

Fixed return statement in DomUtils.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

---------

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed crash when closing Script Canvas

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Fixed node serialized path generation to ignore base class path

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* Remove developer preview title from Shortcuts and Bootstrapper WiX templates (o3de#16825)

Signed-off-by: Mike Chang <changml@amazon.com>

* Switch override prefs from setreg to CVars, and default the DPE Inspector to "off" (o3de#16824)

* made a new CVar for AssetEditor DPE support

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix for Linux DPEs not automatically resizing

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* switch override flags from setreg to CVars

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* remove overarchng DPE flag, and add an Inspector-specific one

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* Update Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabEditorPreferences.cpp

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* addressed PR feedback

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* default outliner overrides to false

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix Inspector override tests

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* remove unnecessary extern

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix more tests

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix some missed tests

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* fix tests to save/restore cvar settings

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* stupid copy pasta fix

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* string fix

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

---------

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Reverting o3de-extras changes

Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>

---------

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
Signed-off-by: Alex Montgomery <alexmont@amazon.com>
Signed-off-by: TJ Kotha <tankotha@amazon.com>
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: gadams3 <guthadam@amazon.com>
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: VickyAtAZ <55564570+VickyAtAZ@users.noreply.github.com>
Signed-off-by: Mike Chang <changml@amazon.com>
Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
Co-authored-by: Chris Galvan <chgalvan@amazon.com>
Co-authored-by: Alex Montgomery <alexmont@amazon.com>
Co-authored-by: Michał Pełka <michal.pelka@robotec.ai>
Co-authored-by: TJ Kotha <tankotha@amazon.com>
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Co-authored-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com>
Co-authored-by: gadams3 <guthadam@amazon.com>
Co-authored-by: Mike Chang <changml@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Co-authored-by: Guthrie Adams <82461473+gadams3@users.noreply.github.com>
Co-authored-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

Author: 12 people

.github/workflows/stabilization-pr-checklist.yaml

@@ -1,7 +1,7 @@
 name: Add stabilization PR checklist
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, reopened]
     branches:
     - stabilization/**

AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_DPEOverrides.py

@@ -17,9 +17,9 @@ class TestAutomationOverridesEnabled(EditorTestSuite):
 
     # These tests will execute with Outliner Overrides/Inspector DPE/Inspector Overrides enabled
     EditorTestSuite.global_extra_cmdline_args.extend(
-        [f"--regset=/O3DE/Preferences/Prefabs/EnableOutlinerOverrideManagement=true",
-         f"--regset=/O3DE/Preferences/Prefabs/EnableInspectorOverrideManagement=true",
-         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPE=true"])
+        [f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableOutlinerOverrideManagement=true",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableInspectorOverrideManagement=true",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPEInspector=true"])
 
     # Add Entity Tests
     class test_AddEntity_UnderAnotherEntity(EditorBatchedTest):

AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py

@@ -17,9 +17,9 @@ class TestAutomationOverridesDisabled(EditorTestSuite):
 
     # These tests will execute with Outliner Overrides/Inspector DPE/Inspector Overrides disabled
     EditorTestSuite.global_extra_cmdline_args.extend(
-        [f"--regset=/O3DE/Preferences/Prefabs/EnableOutlinerOverrideManagement=false",
-         f"--regset=/O3DE/Preferences/Prefabs/EnableInspectorOverrideManagement=false",
-         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPE=false"])
+        [f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableOutlinerOverrideManagement=false",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableInspectorOverrideManagement=false",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPEInspector=false"])
 
     # Add Entity Tests
     class test_AddEntity_UnderAnotherEntity(EditorBatchedTest):
@@ -182,9 +182,9 @@ class TestAutomationOverrides(EditorTestSuite):
 
     # These tests will execute with Outliner Overrides/Inspector DPE/Inspector Overrides enabled
     EditorTestSuite.global_extra_cmdline_args.extend(
-        [f"--regset=/O3DE/Preferences/Prefabs/EnableOutlinerOverrideManagement=true",
-         f"--regset=/O3DE/Preferences/Prefabs/EnableInspectorOverrideManagement=true",
-         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPE=true"])
+        [f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableOutlinerOverrideManagement=true",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableInspectorOverrideManagement=true",
+         f"--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableDPEInspector=true"])
 
     # Overrides Tests
 

AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Periodic.py

@@ -16,7 +16,7 @@
 class TestAutomationNoOverrides(EditorTestSuite):
 
     # These tests will execute with prefab outliner overrides disabled
-    EditorTestSuite.global_extra_cmdline_args.append("--regset=O3DE/Preferences/Prefabs/EnableOutlinerOverrideManagement=false")
+    EditorTestSuite.global_extra_cmdline_args.append("--regset=/O3DE/Autoexec/ConsoleCommands/ed_enableOutlinerOverrideManagement=false")
 
     @pytest.mark.skip(reason="Single test case to avoid suite failure. Can be removed when other tests are added.")
     class test_DummyTest(EditorSingleTest):

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py

@@ -230,8 +230,7 @@ async def asset_picker(allowed_asset_extensions, asset, interaction_option):
         # 4) Click on Asset Picker (Model Asset)
         general.select_object("TestEntity")
         general.idle_wait(0.5)
-        model_asset = component_list_widget.findChildren(QtWidgets.QFrame, "Model Asset")[0]
-        attached_button = model_asset.findChildren(QtWidgets.QPushButton, "attached-button")[0]
+        attached_button = component_list_widget.findChildren(QtWidgets.QPushButton, "attached-button")[0]
 
         # Assign Model Asset via OK button
         pyside_utils.click_button_async(attached_button)
@@ -254,8 +253,7 @@ async def asset_picker(allowed_asset_extensions, asset, interaction_option):
         hydra.get_set_test(entity, 0, "Controller|Configuration|Model Asset", None)
         general.select_object("TestEntity")
         general.idle_wait(0.5)
-        model_asset = component_list_widget.findChildren(QtWidgets.QFrame, "Model Asset")[0]
-        attached_button = model_asset.findChildren(QtWidgets.QPushButton, "attached-button")[0]
+        attached_button = component_list_widget.findChildren(QtWidgets.QPushButton, "attached-button")[0]
 
         # Assign Model Asset via Enter
         pyside_utils.click_button_async(attached_button)

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/DPE_AllComponentPropertyTypesEditable.py

@@ -67,7 +67,7 @@ def edit_component_property_value(component, property_name, value_to_set):
         TestHelper.open_level("", "Base")
 
         # Verify the DPE is enabled
-        Report.critical_result(Tests.dpe_enabled, general.get_cvar("ed_enableDPE") == "true")
+        Report.critical_result(Tests.dpe_enabled, general.get_cvar("ed_enableDPEInspector") == "true")
 
         # Create several new entities to hold various components
         dither_entity = EditorEntity.create_editor_entity("DitherComponentTestEntity")

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/DPE_AllComponentsAddedRemoved.py

@@ -348,7 +348,7 @@ def add_remove_component(component_name):
         TestHelper.open_level("", "Base")
 
         # Verify the DPE is enabled
-        Report.critical_result(Tests.dpe_enabled, general.get_cvar("ed_enableDPE") == "true")
+        Report.critical_result(Tests.dpe_enabled, general.get_cvar("ed_enableDPEInspector") == "true")
 
         # Loop through list of components
         for component_category in all_component_categories:

AutomatedTesting/Gem/PythonTests/editor/TestSuite_DPE.py

@@ -16,7 +16,7 @@
 class TestAutomationDPE(EditorTestSuite):
 
     # Disable Batch Mode and autotest mode and enable the DPE
-    global_extra_cmdline_args = ["-ed_enableDPE=true"]
+    global_extra_cmdline_args = ["-ed_enableDPEInspector=true"]
 
     @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/15718, https://github.com/o3de/o3de/issues/15704, "
                               "https://github.com/o3de/o3de/issues/15695, https://github.com/o3de/o3de/issues/15579")

AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py

@@ -26,6 +26,7 @@ def cleanup_test_level(self, workspace):
         file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
                            True, True)
 
+    @pytest.mark.skip(reason="Skipped for intermittently failing.")
     class test_AssetPicker_UI_UX(EditorBatchedTest):
         from .EditorScripts import AssetPicker_UI_UX as test_module
 

AutomatedTesting/Registry/editorpreferences.setreg

@@ -3,13 +3,5 @@
         "Preferences": {
             "EnablePrefabSystem": true
         }
-    },
-    "O3DE": {
-        "Preferences": {
-            "Prefabs": {
-                "EnableOutlinerOverrideManagement": true,
-                "EnableInspectorOverrideManagement": false
-            }
-        }
     }
-}
+}