santorac b5c7869f14 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3 ...

There were lots of material system conflicts that had to be resolved. I expect the build is broken at this commit, and I'll fix it in followup commits.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>

2022-01-25 14:47:24 -08:00

..

EditorMaterialComponent.cpp

Created custom JSON serializer for editor material component

2021-10-30 17:36:07 -05:00

EditorMaterialComponent.h

Created custom JSON serializer for editor material component

2021-10-30 17:36:07 -05:00

EditorMaterialComponentExporter.cpp

Adding new commands to the material component for managing, removing, repairing material slots

2021-09-19 18:42:24 -05: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

Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3

2022-01-25 14:47:24 -08:00

EditorMaterialComponentInspector.h

Updated editor material component slots to support dynamic previews rendered with property overrides applied

2021-10-12 13:19:38 -05:00

EditorMaterialComponentSerializer.cpp

fix header comments

2021-10-31 15:12:27 -05:00

EditorMaterialComponentSerializer.h

fix header comments

2021-10-31 15:12:27 -05:00

EditorMaterialComponentSlot.cpp

Updated editor material component slots to support dynamic previews rendered with property overrides applied

2021-10-12 13:19:38 -05:00

EditorMaterialComponentSlot.h

Updated editor material component slots to support dynamic previews rendered with property overrides applied

2021-10-12 13:19:38 -05:00

EditorMaterialComponentUtil.cpp

Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3

2022-01-25 14:47:24 -08:00

EditorMaterialComponentUtil.h

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

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

EditorMaterialModelUvNameMapInspector.cpp

Updated MaterialPropertyId class in preparation for nested material property sets.

2022-01-20 15:43:22 -08:00

EditorMaterialModelUvNameMapInspector.h

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

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

EditorMaterialSystemComponent.cpp

Atom Tools: disabling auto load of unused gems in some atom tools

2022-01-18 17:14:49 -06:00

EditorMaterialSystemComponent.h

correcting const casing

2021-10-19 11:57:40 -05:00

MaterialBrowserInteractions.cpp

Changing material component property inspector to dockable view pane

2021-09-14 19:11:11 -05: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

Temporary fix for material component losing image overrides with prefabs

2021-12-13 11:35:05 -06:00

MaterialComponentController.h

Temporary fix for material component losing image overrides with prefabs

2021-12-13 11:35:05 -06:00