birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
db5fd91ac9fa018531f86202e821ee209ff9ec60
o3de/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material
T
History
Guthrie Adams 9f65277906 restoring changes lost in merge 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-09-15 19:17:33 -05:00
..
EditorMaterialComponent.cpp
Merge branch 'development' into Atom/guthadam/multiple_dockable_pinned_material_component_property_editor
2021-09-15 18:45:22 -05:00
EditorMaterialComponent.h
Merge branch 'development' into Atom/guthadam/multiple_dockable_pinned_material_component_property_editor
2021-09-15 18:45:22 -05:00
EditorMaterialComponentExporter.cpp
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
2021-08-27 11:24:05 -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
Rebuilding UI and instance data hierarchy on any external property change
2021-09-15 18:14:18 -05:00
EditorMaterialComponentInspector.h
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -05:00
EditorMaterialComponentSlot.cpp
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -05:00
EditorMaterialComponentSlot.h
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -05: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
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -05:00
EditorMaterialSystemComponent.h
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -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
restoring changes lost in merge
2021-09-15 19:17:33 -05:00
MaterialComponentController.h
Changing material component property inspector to dockable view pane
2021-09-14 19:11:11 -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