mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0023328: Importing VRML files with "scaleOrientation" not possible
If-else blocks "scale" and "scaleOrientation" was swapped. Now the comparing and interpretation of these key-words is correct. Added test case bugs/xde/bug23328
This commit is contained in:
@@ -276,15 +276,7 @@ VrmlData_ErrorStatus VrmlData_Group::Read (VrmlData_InBuffer& theBuffer)
|
||||
aStatus = VrmlData_VrmlFormatError;
|
||||
break;
|
||||
}
|
||||
else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "scale")) {
|
||||
if (myIsTransform)
|
||||
aStatus = Scene().ReadXYZ (theBuffer, aScale,
|
||||
Standard_False, Standard_True);
|
||||
else {
|
||||
aStatus = VrmlData_VrmlFormatError;
|
||||
break;
|
||||
}
|
||||
} else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "scaleOrientation"))
|
||||
else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "scaleOrientation"))
|
||||
if (myIsTransform) {
|
||||
if (OK(aStatus, Scene().ReadXYZ (theBuffer, aScaleAxis,
|
||||
Standard_False, Standard_False)))
|
||||
@@ -294,6 +286,14 @@ VrmlData_ErrorStatus VrmlData_Group::Read (VrmlData_InBuffer& theBuffer)
|
||||
aStatus = VrmlData_VrmlFormatError;
|
||||
break;
|
||||
}
|
||||
else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "scale"))
|
||||
if (myIsTransform)
|
||||
aStatus = Scene().ReadXYZ (theBuffer, aScale,
|
||||
Standard_False, Standard_True);
|
||||
else {
|
||||
aStatus = VrmlData_VrmlFormatError;
|
||||
break;
|
||||
}
|
||||
else if (VRMLDATA_LCOMPARE (theBuffer.LinePtr, "translation"))
|
||||
if (myIsTransform)
|
||||
aStatus = Scene().ReadXYZ (theBuffer, aTrans,
|
||||
|
Reference in New Issue
Block a user