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 3bca63bb71 Temporary fix for material component losing image overrides with prefabs ... The bug reported that overridden texture properties would be lost whenever an entity was created, destroyed, or a prefab was created. Initially, it seemed like there was a problem with the custom JSON serializer for material properties. Debugging proved this to be incorrect because all of the data was converted to JSON values in the serializer on multiple passes. At some point during prefab patching, the data for the asset properties is lost while other values like colors and floats serialize correctly. Converting the asset data values into asset IDs resolves the immediate problem for the material component but the underlying issue is still under investigation by the prefab team. This change is being posted for review in case the underlying issue cannot be resolved in time for the next release. Signed-off-by: Guthrie Adams <guthadam@amazon.com> Fixing unittests and moving texture conversion into material component controller Signed-off-by: Guthrie Adams <guthadam@amazon.com>		4 years ago
..
EditorMaterialComponent.cpp	Created custom JSON serializer for editor material component	4 years ago
EditorMaterialComponent.h	Created custom JSON serializer for editor material component	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.	5 years ago
EditorMaterialComponentInspector.cpp	Minor updates in response to code review feedback.	4 years ago
EditorMaterialComponentInspector.h	Updated editor material component slots to support dynamic previews rendered with property overrides applied	4 years ago
EditorMaterialComponentSerializer.cpp	fix header comments	4 years ago
EditorMaterialComponentSerializer.h	fix header comments	4 years ago
EditorMaterialComponentSlot.cpp	Updated editor material component slots to support dynamic previews rendered with property overrides applied	4 years ago
EditorMaterialComponentSlot.h	Updated editor material component slots to support dynamic previews rendered with property overrides applied	4 years ago
EditorMaterialComponentUtil.cpp	Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures	4 years ago
EditorMaterialComponentUtil.h	Shorten copyright headers by splitting into 2 lines (#2213)	5 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)	5 years ago
EditorMaterialSystemComponent.cpp	Fixing material system component mac release build	4 years ago
EditorMaterialSystemComponent.h	correcting const casing	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)	5 years ago
MaterialComponent.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
MaterialComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	5 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.	5 years ago
MaterialComponentController.cpp	Temporary fix for material component losing image overrides with prefabs	4 years ago
MaterialComponentController.h	Temporary fix for material component losing image overrides with prefabs	4 years ago