Update MetaData.xmlv2.3.0-beta2

Materials no longer have name property, the default value is obtained
from MaterialBase. Changed the property parsing logic accordingly.

Change-Id: I40653eeefcbeb1c4e293b75b328ebc4a66f2b2de
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp
index c7b48f8..0ca1967 100644
--- a/src/runtime/q3dsuippresentation.cpp
+++ b/src/runtime/q3dsuippresentation.cpp
@@ -2008,6 +2008,12 @@ void Q3DSDefaultMaterial::setProps(const V &attrs, PropSetFlags flags)
 
     // Different default value.
     parseProperty(attrs, flags, typeName, QStringLiteral("name"), &m_name);
+
+    // If name was not obtained, get default name from MaterialBase
+    if (m_name.isEmpty()) {
+        const QString materialBaseTypeName = QStringLiteral("MaterialBase");
+        parseProperty(attrs, flags, materialBaseTypeName, QStringLiteral("name"), &m_name);
+    }
 }
 
 void Q3DSDefaultMaterial::setProperties(const QXmlStreamAttributes &attrs, PropSetFlags flags)
@@ -2237,6 +2243,12 @@ void Q3DSReferencedMaterial::setProps(const V &attrs, PropSetFlags flags)
 
     // Different default value.
     parseProperty(attrs, flags, typeName, QStringLiteral("name"), &m_name);
+
+    // If name was not obtained, get default name from MaterialBase
+    if (m_name.isEmpty()) {
+        const QString materialBaseTypeName = QStringLiteral("MaterialBase");
+        parseProperty(attrs, flags, materialBaseTypeName, QStringLiteral("name"), &m_name);
+    }
 }
 
 void Q3DSReferencedMaterial::setProperties(const QXmlStreamAttributes &attrs, PropSetFlags flags)
@@ -2322,6 +2334,12 @@ void Q3DSCustomMaterialInstance::setProps(const V &attrs, PropSetFlags flags)
 
     // Different default value.
     parseProperty(attrs, flags, typeName, QStringLiteral("name"), &m_name);
+
+    // If name was not obtained, get default name from MaterialBase
+    if (m_name.isEmpty()) {
+        const QString materialBaseTypeName = QStringLiteral("MaterialBase");
+        parseProperty(attrs, flags, materialBaseTypeName, QStringLiteral("name"), &m_name);
+    }
 }
 
 void Q3DSCustomMaterialInstance::setProperties(const QXmlStreamAttributes &attrs, PropSetFlags flags)