Browse Source

Merge branch 'Misc-HDR-And-Levels' of https://github.com/vvv-yeaf/Torque3D into Misc-HDR-And-Levels

# Conflicts:
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
vvv-yeaf 3 years ago
parent
commit
f08d2f74f8

+ 1 - 2
Templates/BaseGame/game/data/Prototyping/Materials/FloorGray.asset.taml

@@ -9,8 +9,7 @@
         originalAssetName="FloorGray">
         <Material.Stages>
             <Stages_beginarray
-                DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"
-                Roughness="0.2"/>
+                DiffuseMapAsset="Prototyping:FloorGray_ALBEDO"/>
         </Material.Stages>
     </Material>
 </MaterialAsset>

+ 1 - 2
Templates/BaseGame/game/data/Prototyping/Materials/WallOrange.asset.taml

@@ -9,8 +9,7 @@
         originalAssetName="WallOrange">
         <Material.Stages>
             <Stages_beginarray
-                DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"
-                Roughness="0.2"/>
+                DiffuseMapAsset="Prototyping:WallOrange_ALBEDO"/>
         </Material.Stages>
     </Material>
 </MaterialAsset>