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 afdf35a925 updated material editor skybox and changed property icons ... Signed-off-by: Guthrie Adams <guthadam@amazon.com>		4 years ago
..
EditorMaterialComponent.cpp	Merge remote-tracking branch 'origin/development' into component-doc-links	4 years ago
EditorMaterialComponent.h	Adding new commands to the material component for managing, removing, repairing material slots	4 years ago
EditorMaterialComponentExporter.cpp	Adding new commands to the material component for managing, removing, repairing material slots	4 years ago
EditorMaterialComponentExporter.h	Removed the GetLabelByAssetId function since now we can use the display name that comes with the ModelMaterialSlot.	4 years ago
EditorMaterialComponentInspector.cpp	updated material editor skybox and changed property icons	4 years ago
EditorMaterialComponentInspector.h	Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator	4 years ago
EditorMaterialComponentSlot.cpp	Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides	4 years ago
EditorMaterialComponentSlot.h	Material Component: Can set material property overrides on default materials	4 years ago
EditorMaterialComponentUtil.cpp	Updated the naming convention for material property "names" vs "IDs".	4 years ago
EditorMaterialComponentUtil.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialModelUvNameMapInspector.cpp	Updated the naming convention for material property "names" vs "IDs".	4 years ago
EditorMaterialModelUvNameMapInspector.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialSystemComponent.cpp	Update MaterialEditor launcher to use platform traits for executable extensions (#4429)	4 years ago
EditorMaterialSystemComponent.h	Changing material component property inspector to dockable view pane	4 years ago
MaterialBrowserInteractions.cpp	Changing material component property inspector to dockable view pane	4 years ago
MaterialBrowserInteractions.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialComponent.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialComponentConfig.cpp	Refactored how model material slots work in preparation to support more flexible material conversion options for the scene asset pipeline. The material slot IDs are based on the MaterialUid that come from SceneAPI. Since these IDs are also used as the AssetId sub-ID for the converted material assets, the system was just checking the material asset sub-ID to determine the material slot ID. But in order to support certain FBX material conversion options, we needed to break this tie, so the slot ID is separate from the AssetId of the material in that slot. This will allow some other material to be used in the slot, instead of being forced to use one that was generated from the FBX.	4 years ago
MaterialComponentController.cpp	Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides	4 years ago
MaterialComponentController.h	moved code for applying properties to MaterialAssignment	4 years ago
MaterialThumbnail.cpp	Updated thumbnail notification bus to use const QPixmap&	4 years ago
MaterialThumbnail.h	Updated thumbnail notification bus to use const QPixmap&	4 years ago