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.

santorac b407e501e3 Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion		4 years ago
..
EditorMaterialComponent.cpp	Restored the previous behavior of preventing material property overrides when there is no explicit material override assignment.	4 years ago
EditorMaterialComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialComponentExporter.cpp	Removed the GetLabelByAssetId function since now we can use the display name that comes with the ModelMaterialSlot.	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	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialComponentInspector.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialComponentSlot.cpp	Reverted partial support for property overrides on default material assignments. This needs more UI design discussion first.	4 years ago
EditorMaterialComponentSlot.h	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
EditorMaterialComponentUtil.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialComponentUtil.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialModelUvNameMapInspector.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialModelUvNameMapInspector.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialSystemComponent.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
EditorMaterialSystemComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialBrowserInteractions.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	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	Material Component: Add functions to lookup material ids by name	4 years ago
MaterialComponentController.h	Material Component: Add functions to lookup material ids by name	4 years ago
MaterialThumbnail.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialThumbnail.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago