Merge pull request #6104 from cyberbotics/sync-master-50e74d6ba

Merge master into develop

Author: Benjamin Délèze

docs/reference/changelog-r2023.md

@@ -77,6 +77,7 @@ Released on ??
     - Fixed the double downloading of meshes ([#6034](https://github.com/cyberbotics/webots/pull/6034)).
     - Fixed generation of moment of inertia matrix based on bounding box ([#6048](https://github.com/cyberbotics/webots/pull/6048)).
     - Fixed the loading of remote mesh bounding objects ([#6047](https://github.com/cyberbotics/webots/pull/6047)).
+    - Fixed crash during conversion of PROTO to base nodes in case of Mesh nodes with invalid scale values ([#6088](https://github.com/cyberbotics/webots/pull/6088)).
 
 ## Webots R2023a
 Released on November 29th, 2022.

src/webots/nodes/WbCadShape.cpp

@@ -268,11 +268,7 @@ QStringList WbCadShape::objMaterialList(const QString &url) const {
       if (!cleanLine.startsWith("mtllib"))
         continue;
 
-      cleanLine = cleanLine.replace("mtllib ", "").trimmed();
-      cleanLine = cleanLine.replace("\"", "");
-      materials << cleanLine.split(".mtl ", Qt::SkipEmptyParts);
-      for (int i = 0; i < materials.size() - 1; i++)  // the last item still have '.mtl'
-        materials[i] += ".mtl";
+      materials << cleanLine.replace("mtllib ", "").replace("\"", "").trimmed();
     }
   } else
     warn(tr("File '%1' cannot be read.").arg(url));

src/webots/nodes/WbTransform.cpp

@@ -326,7 +326,7 @@ bool WbTransform::isAValidBoundingObject(bool checkOde, bool warning) const {
     return false;
   }
 
-  if (g->isAValidBoundingObject(checkOde, warning) == false)
+  if (!g->isPostFinalizedCalled() || !g->isAValidBoundingObject(checkOde, warning))
     return false;
 
   if (checkOde && g->odeGeom() == NULL)

src/webots/nodes/WbTriangleMeshGeometry.cpp

@@ -361,6 +361,7 @@ bool WbTriangleMeshGeometry::isSuitableForInsertionInBoundingObject(bool warning
 }
 
 bool WbTriangleMeshGeometry::isAValidBoundingObject(bool checkOde, bool warning) const {
+  assert(mTriangleMesh);
   return mTriangleMesh->isValid() && WbGeometry::isAValidBoundingObject(checkOde, warning);
 }
 /////////////////