diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2018-06-03 19:40:12 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2018-06-05 09:56:33 +0000 |
| commit | 6d0b7102ce6016ef212c2386dd213096e9290a52 (patch) | |
| tree | 12097215d667d23371a0541084a8b8fd92769a12 | |
| parent | fa2a23a0a72bc5868e3e0edbc430ae913ff59f93 (diff) | |
Fix two materials which were not working
Aluminum_emissive had a duplicate of the Emissive Mask Map property.
Carpaint_color_peel_2 had two copies of orange peel size where as it
should have had a peel amount property as well.
Change-Id: I5b931560a8b911b57c5e531bd804eaeffb63d93d
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| -rw-r--r-- | Studio/Content/Material Library/aluminum_emissive.material | 1 | ||||
| -rw-r--r-- | Studio/Content/Material Library/carpaint_color_peel_2_layer.material | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Studio/Content/Material Library/aluminum_emissive.material b/Studio/Content/Material Library/aluminum_emissive.material index cd29f12a..5512dcd0 100644 --- a/Studio/Content/Material Library/aluminum_emissive.material +++ b/Studio/Content/Material Library/aluminum_emissive.material @@ -19,7 +19,6 @@ <Property formalName="Emissive Mask Offset" name="emissive_mask_offset" description="Offset of the emissive mask texture" type="Vector" default="0 0 0" category="Material"/> <Property formalName="Bump Map" name="bump_texture" description="Bump texture of the material" type="Texture" filter="linear" minfilter="linearMipmapLinear" clamp="repeat" usage="bump" default="./maps/materials/grunge_d.png" category="Material"/> <Property formalName="Bump Amount" name="bump_amount" type="Float" min="0" max="2" default="0.500000" description="Scale value for bump amount" category="Material"/> - <Property formalName="Emissive Mask Map" name="emissive_mask_texture" description="Emissive mask texture for the material" type="Texture" filter="linear" minfilter="linearMipmapLinear" clamp="repeat" usage="emissive_mask" category="Material"/> </MetaData> <Shaders type="GLSL" version="330"> <Shader> diff --git a/Studio/Content/Material Library/carpaint_color_peel_2_layer.material b/Studio/Content/Material Library/carpaint_color_peel_2_layer.material index 0cb163ec..2db1bf52 100644 --- a/Studio/Content/Material Library/carpaint_color_peel_2_layer.material +++ b/Studio/Content/Material Library/carpaint_color_peel_2_layer.material @@ -20,7 +20,7 @@ <Property formalName="Base Color" name="base_color" type="Color" description="Base color of the material" default="0.1 0.001 0.001" category="Base paint"/> <Property formalName="Flake Macro roughness" name="flake_bumpiness" description="Bumpiness of the flakes" type="Float" default="0.600000" category="Flake layer"/> <Property formalName="Orange Peel Size" name="peel_size" description="Orange peel bump size" type="Float" default="1.000000" category="Top coat"/> - <Property formalName="Orange Peel Size" name="peel_size" description="Orange peel bump size" type="Float" default="0.010000" category="Top coat"/> + <Property formalName="Orange Peel Amount" name="peel_amount" description="Orange peel amount" type="Float" default="0.010000" category="Top coat"/> </MetaData> <Shaders type="GLSL" version="330"> <Shader> @@ -196,7 +196,7 @@ void computeBackLayerEnvironment( in vec3 normal, in vec3 viewDir, float aoFacto float computeIOR() { - return( false ? 1.0 : luminance( vec3( 1, 1, 1 ) ) ); + return( false ? 1.0f : luminance( vec3( 1, 1, 1 ) ) ); } float evalCutout() |