birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2022-01-14 16:18:26 -08:00
parent 638fc027f5
commit f87d0f8386
231 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/maya_materials_export.py
+1 -1
View File
@@ -382,7 +382,7 @@ class MayaToLumberyard(QtWidgets.QWidget):
material = {'description': name,
'materialType': default_settings.get('materialType'),
'parentMaterial': default_settings.get('parentMaterial'),
'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'),
'materialTypeVersion': default_settings.get('materialTypeVersion'),
'properties': self.get_shader_properties(name, material_type, file_connections)}
self.material_definitions[name if name not in self.material_definitions.keys() else self.get_increment(name)] = material
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Atom/Scripts/Python/DCC_Materials/pbr.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"occlusion": {
"diffuseFactor": 1.0,
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/main.py
+1 -1
View File
@@ -628,7 +628,7 @@ class MaterialsToLumberyard(QtWidgets.QWidget):
'description': name,
'materialType': default_settings.get('materialType'),
'parentMaterial': default_settings.get('parentMaterial'),
'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'),
'materialTypeVersion': default_settings.get('materialTypeVersion'),
'properties': self.get_lumberyard_material_properties(name, dcc_app, material_type, file_connections)}
self.lumberyard_materials_dictionary[name if name not in self.lumberyard_materials_dictionary.keys() else
self.get_filename_increment(name)] = material
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/materials_export.py
+1 -1
View File
@@ -546,7 +546,7 @@ class MaterialsToLumberyard(QtWidgets.QWidget):
'description': name,
'materialType': default_settings.get('materialType'),
'parentMaterial': default_settings.get('parentMaterial'),
'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'),
'materialTypeVersion': default_settings.get('materialTypeVersion'),
'properties': self.get_lumberyard_material_properties(name, material_type, file_connections)}
self.material_definitions[name if name not in self.material_definitions.keys() else
self.get_filename_increment(name)] = material
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/dcc_materials/pbr.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"occlusion": {
"diffuseFactor": 1.0,
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/kitbash_converter/standardPBR.template.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"texcoord": 0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/standardPBR.template.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"texcoord": 0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/maya_materials_export.py
+1 -1
View File
@@ -387,7 +387,7 @@ class MayaToLumberyard(QtWidgets.QWidget):
material = {'description': name,
'materialType': default_settings.get('materialType'),
'parentMaterial': default_settings.get('parentMaterial'),
'propertyLayoutVersion': default_settings.get('propertyLayoutVersion'),
'materialTypeVersion': default_settings.get('materialTypeVersion'),
'properties': self.get_shader_properties(name, material_type, file_connections)}
self.material_definitions[name if name not in self.material_definitions.keys() else self.get_increment(name)] = material
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_dcc_materials/standardpbr.template.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"occlusion": {
"diffuseFactor": 1.0,
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/stingraypbs_converter/StandardPBR_AllProperties.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"occlusion": {
"diffuseFactor": 1.0,
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/StandardPBR_AllProperties.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"texcoord": 0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"material": {
"baseMaterial": "StaticMesh.basematerial",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"general": {
"DiffuseColor": [ 1.0, 0.5, 0.5, 1.0 ],
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/resources/atom/atom_variant00.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\StandardPBR\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"texcoord": 0
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/Resources/Atom/StandardPBR_AllProperties.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"texcoord": 0