diff --git a/Include/Model/Classes/NMR_ModelConstants.h b/Include/Model/Classes/NMR_ModelConstants.h index eeae3c430..18eb8fd7d 100644 --- a/Include/Model/Classes/NMR_ModelConstants.h +++ b/Include/Model/Classes/NMR_ModelConstants.h @@ -258,7 +258,8 @@ These are given by the 3MF Standard // Voumeteric/Implicit -#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION "function" +#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION_DEPRECATED "function" +#define XML_3MF_ELEMENT_IMPLICIT_FUNCTION "implicitfunction" #define XML_3MF_ATTRIBUTE_IMPLICIT_FUNCTION_ID "id" #define XML_3MF_ATTRIBUTE_IMPLICIT_FUNCTION_DISPLAY_NAME "displayname" diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp index edb0e3f3c..5df4ddd9b 100644 --- a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp +++ b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Resources.cpp @@ -152,11 +152,6 @@ namespace NMR { m_pModel, m_pWarnings); pXMLNode->parseXML(pXMLReader); } - else if (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0) - { - PModelReaderNode_ImplicitFunction pXMLNode = std::make_shared(m_pModel, m_pWarnings); - pXMLNode->parseXML(pXMLReader); - } else if (strcmp(pChildName, XML_3MF_ELEMENT_FUNCTION_FROM_IMAGE3D) == 0) { PModelReaderNode pXMLNode = std::make_shared( @@ -173,7 +168,7 @@ namespace NMR { } if (strcmp(pNameSpace, XML_3MF_NAMESPACE_IMPLICITSPEC) == 0) { - if (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0) + if ((strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION_DEPRECATED) == 0) || (strcmp(pChildName, XML_3MF_ELEMENT_IMPLICIT_FUNCTION) == 0)) { PModelReaderNode_ImplicitFunction pXMLNode = std::make_shared(m_pModel, m_pWarnings); pXMLNode->parseXML(pXMLReader);