santorac b407e501e3 Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion

2021-07-30 14:54:14 -07:00

..

EditorMaterialComponent.cpp

Restored the previous behavior of preventing material property overrides when there is no explicit material override assignment.

2021-07-30 11:41:12 -07:00

EditorMaterialComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialComponentExporter.cpp

Removed the GetLabelByAssetId function since now we can use the display name that comes with the ModelMaterialSlot.

2021-07-30 11:40:54 -07:00

EditorMaterialComponentExporter.h

Removed the GetLabelByAssetId function since now we can use the display name that comes with the ModelMaterialSlot.

2021-07-30 11:40:54 -07:00

EditorMaterialComponentInspector.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialComponentInspector.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialComponentSlot.cpp

Reverted partial support for property overrides on default material assignments. This needs more UI design discussion first.

2021-07-30 11:41:15 -07:00

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.

2021-07-30 11:40:51 -07:00

EditorMaterialComponentUtil.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialComponentUtil.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialModelUvNameMapInspector.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialModelUvNameMapInspector.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialSystemComponent.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

EditorMaterialSystemComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialBrowserInteractions.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialBrowserInteractions.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialComponent.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

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.

2021-07-30 11:40:51 -07:00

MaterialComponentController.cpp

Material Component: Add functions to lookup material ids by name

2021-07-29 18:09:40 -05:00

MaterialComponentController.h

Material Component: Add functions to lookup material ids by name

2021-07-29 18:09:40 -05:00

MaterialThumbnail.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialThumbnail.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00