diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-09-11 13:12:52 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-09-11 10:55:54 +0000 |
| commit | 2242866544e682b6d604b6540e2e7e5fa36f3153 (patch) | |
| tree | 74920080e88e805160207f6c9050dd39f5e652cc /src/Runtime/res | |
| parent | 261ba65ad6497184dc77c1e49872d92884bb3f8b (diff) | |
Add Basic Properties to Material inspector
Task-number: QT3DS-2256
Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/res')
| -rw-r--r-- | src/Runtime/res/DataModelMetadata/en-us/MetaData.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml index 3af22bef..e2cfd852 100644 --- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml +++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml @@ -227,18 +227,16 @@ <Property name="shdwmapfar" formalName="Shadow Far Clip" description="Affects the maximum distance for the shadow\ndepth map" default="5000" /> <Property name="shdwmapfov" formalName="Shadow Field of View" description="Affects the field of view of the shadow\ncamera" default="90" min="1" max="179" hidden="True" /> </Light> + <MaterialBase> + <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="False" category="Basic Properties" /> + <Property name="iblprobe" formalName="IBL Override" description="IBL probe to use in place of the\nlayer probe for this material" type="Image" category="Basic Properties" /> + </MaterialBase> <Lightmaps> - <Property name="name" formalName="Name" description="Object name" type="String" default="Lightmaps" hidden="False" category="Lighting" /> <Property name="lightmapindirect" formalName="Indirect Lightmap" description="Image providing indirect light values\nfor GI" type="Image" category="Lighting" /> <Property name="lightmapradiosity" formalName="Radiosity Lightmap" description="Image providing directional light values" type="Image" category="Lighting" /> <Property name="lightmapshadow" formalName="Shadow Lightmap" description="Baked Shadow map" type="Image" category="Lighting" /> </Lightmaps> - <MaterialBase> - <Property name="name" formalName="Name" description="Object name" type="String" default="MaterialBase" hidden="False" category="Material" /> - <Property name="iblprobe" formalName="IBL Override" description="IBL probe to use in place of the\nlayer probe for this material" type="Image" category="Material" /> - </MaterialBase> <Material> - <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="False" category="Material" /> <Property name="shaderlighting" formalName="Lighting" description="Light model" list="Pixel:None" default="Pixel" category="Material" /> <Property name="blendmode" formalName="Blending Mode" description="How this material blends with content\nbehind it. Modes marked with * are\navailable only with HW supporting\nadvanced blending modes." list="Normal:Screen:Multiply:*Overlay:*ColorBurn:*ColorDodge" default="Normal" category="Material" /> <Property name="vertexcolors" formalName="Enable Vertex Colors" description="Use vertex colors from the mesh" type="Boolean" default="False" animatable="False" category="Material" /> @@ -271,7 +269,6 @@ <Property name="diffuselightwrap" formalName="Diffuse Light Wrap" description="Diffuse Light Wrap" type="float" min='0.0' max='1.0' category="Material" /> </Material> <ReferencedMaterial> - <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="True" category="Material" /> <Property name="referencedmaterial" formalName="Referenced Material" description="Material to use all settings from" type="ObjectRef" category="Material" /> </ReferencedMaterial> <Model> |