Skip to content

Commit 6c7e7bc

Browse files
authored
Merge pull request #207 from cyberbotics/merge-develop-into-master
Merge develop into master
2 parents c4cccd7 + bacaebf commit 6c7e7bc

File tree

12 files changed

+841
-41
lines changed

12 files changed

+841
-41
lines changed

tests/expected/Human.proto

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#VRML_SIM R2023a utf8
1+
#VRML_SIM R2023b utf8
22
# license: Apache License 2.0
33
# license url: http://www.apache.org/licenses/LICENSE-2.0
44
# This is a proto file for Webots for the Human
@@ -362,14 +362,8 @@ PROTO Human [
362362
}
363363
]
364364
name "calcn_r"
365-
boundingObject Transform {
366-
scale 1.000000 -1.000000 1.000000
367-
children [
368-
DEF Calcn_L_001_cw Mesh {
369-
url "../sources/gait2392_simbody/meshes/obj/Calcn L.001.obj"
370-
ccw FALSE
371-
}
372-
]
365+
boundingObject DEF Calcn_R_001 Mesh {
366+
url "../sources/gait2392_simbody/meshes/obj/Calcn R.001.obj"
373367
}
374368
physics Physics {
375369
density -1

tests/expected/HumanR2022a.proto

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -439,14 +439,8 @@ PROTO HumanR2022a [
439439
}
440440
]
441441
name "calcn_r"
442-
boundingObject Transform {
443-
scale 1.000000 -1.000000 1.000000
444-
children [
445-
DEF Calcn_L_001_cw Mesh {
446-
url "../sources/gait2392_simbody/meshes/obj/Calcn L.001.obj"
447-
ccw FALSE
448-
}
449-
]
442+
boundingObject DEF Calcn_R_001 Mesh {
443+
url "../sources/gait2392_simbody/meshes/obj/Calcn R.001.obj"
450444
}
451445
physics Physics {
452446
density -1

0 commit comments

Comments
 (0)