Merge pull request #207 from cyberbotics/merge-develop-into-master

Merge develop into master
cyberbotics · Jun 29, 2023 · 6c7e7bc · 6c7e7bc
2 parents c4cccd7 + bacaebf
commit 6c7e7bc
Show file tree

Hide file tree

Showing 12 changed files with 841 additions and 41 deletions.
diff --git a/tests/expected/Human.proto b/tests/expected/Human.proto
@@ -1,4 +1,4 @@
-#VRML_SIM R2023a utf8
+#VRML_SIM R2023b utf8
 # license: Apache License 2.0
 # license url: http://www.apache.org/licenses/LICENSE-2.0
 # This is a proto file for Webots for the Human
@@ -362,14 +362,8 @@ PROTO Human [
                               }
                             ]
                             name "calcn_r"
-                            boundingObject Transform {
-                              scale 1.000000 -1.000000 1.000000
-                              children [
-                                DEF Calcn_L_001_cw Mesh {
-                                  url "../sources/gait2392_simbody/meshes/obj/Calcn L.001.obj"
-                                  ccw FALSE
-                                }
-                              ]
+                            boundingObject DEF Calcn_R_001 Mesh {
+                              url "../sources/gait2392_simbody/meshes/obj/Calcn R.001.obj"
                             }
                             physics Physics {
                               density -1

diff --git a/tests/expected/HumanR2022a.proto b/tests/expected/HumanR2022a.proto
@@ -439,14 +439,8 @@ PROTO HumanR2022a [
                               }
                             ]
                             name "calcn_r"
-                            boundingObject Transform {
-                              scale 1.000000 -1.000000 1.000000
-                              children [
-                                DEF Calcn_L_001_cw Mesh {
-                                  url "../sources/gait2392_simbody/meshes/obj/Calcn L.001.obj"
-                                  ccw FALSE
-                                }
-                              ]
+                            boundingObject DEF Calcn_R_001 Mesh {
+                              url "../sources/gait2392_simbody/meshes/obj/Calcn R.001.obj"
                             }
                             physics Physics {
                               density -1