Egalware/lib3mf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib3mf 2.5 :

Browse Source 
- aggiornamento versione
- utilizzate le nostre librerie esterne libzip e zlib e non quelle incluse in lib3mf.
This commit is contained in:
SaraP
2026-08-25 12:44:11 +02:00
parent ea6efc1e36
commit 513f08e691
544 changed files with 52634 additions and 30760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Model/Classes/NMR_ModelMultiPropertyGroup.cpp
+6 -1
View File
@@ -221,6 +221,7 @@ namespace NMR {
switch (eBlendMethod) {
case MODELBLENDMETHOD_MIX: return XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MIX;
case MODELBLENDMETHOD_MULTIPLY: return XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MULTIPLY;
case MODELBLENDMETHOD_MASK: return XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MASK;
default:
return XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MIX;
}
@@ -229,9 +230,13 @@ namespace NMR {
{
if (sBlendMethod == XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MIX) {
return MODELBLENDMETHOD_MIX;
} else if (sBlendMethod == XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MULTIPLY) {
}
else if (sBlendMethod == XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MULTIPLY) {
return MODELBLENDMETHOD_MULTIPLY;
}
else if (sBlendMethod == XML_3MF_ATTRIBUTE_MULTIPROPERTIES_BLENDMETHOD_MASK) {
return MODELBLENDMETHOD_MASK;
}
else {
throw CNMRException(NMR_ERROR_INVALID_BLENDMETHOD_ATTRIBUTE);
}