You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Guthrie Adams 050de68f7d Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator ... Signed-off-by: Guthrie Adams <guthadam@amazon.com> # Conflicts: # Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp # Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h # Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp # Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h		4 years ago
..
Icons	Initial commit	5 years ago
InspectorGroupHeaderWidget.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
InspectorGroupWidget.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
InspectorPropertyGroupWidget.cpp	Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator	4 years ago
InspectorWidget.cpp	Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes	4 years ago
InspectorWidget.qrc	Initial commit	5 years ago
InspectorWidget.ui	Atom Tools: Fixing problems with inspector property group layout and deletion	4 years ago