Merge branch 'master' into sync-released-bbe0b9333

Author: omichel

docs/reference/changelog-r2025.md

@@ -1,5 +1,9 @@
 # Webots R2025 Change Log
 
+## Webots R2025b
+  - Bug Fixes
+    - Fixed a bug preventing the `webots-controller` executable from running on arm-based mac devices ([#6806](https://github.com/cyberbotics/webots/pull/6806)).
+
 ## Webots R2025a
 Released on January 31st, 2025.
   - New Features
@@ -24,7 +28,7 @@ Released on January 31st, 2025.
     - Improved the image range of the rotating [Lidar](lidar.md) ([#6324](https://github.com/cyberbotics/webots/pull/6324)).
     - Show box-plane contact point normals when showing contact points ([#6678](https://github.com/cyberbotics/webots/pull/6678)).
     - Improved the speed and accuracy of box-plane collisions ([#6688](https://github.com/cyberbotics/webots/pull/6688)).
-    - Enabled the launching of MATLAB desktop from the extern launcher ([#6366](https://github.com/cyberbotics/webots/pull/6366)). 
+    - Enabled the launching of MATLAB desktop from the extern launcher ([#6366](https://github.com/cyberbotics/webots/pull/6366)).
     - Improved overlays visible in Overlays menu by adding all the robots in the menu list ([#6297](https://github.com/cyberbotics/webots/pull/6297)).
   - Cleanup
     - Removed deprecated `windowPosition`, `pixelSize` fields of [Display](display.md) node ([#6327](https://github.com/cyberbotics/webots/pull/6327)).

docs/reference/generalities.md

@@ -4,10 +4,10 @@ Webots world files must use the ".wbt" file name extension.
 The first line of a ".wbt" file uses this header:
 
 ```
-#VRML_SIM V8.5 utf8
+#VRML_SIM R2025a utf8
 ```
 
-The version *8.5* specifies that the file can be open with *Webots 8*.
+The version *R2025a* specifies that the file can be open with *Webots 2025a*.
 Although the header specifies *utf8*, at the moment only ascii is supported.
 
 The comments placed just below the header store the window configuration associated with this world.
@@ -16,7 +16,7 @@ One (and only one) instance of each of the `WorldInfo, ViewPoint` and `Backgroun
 For example:
 
 ```
-#VRML_SIM V8.5 utf8
+#VRML_SIM R2025a utf8
 
 WorldInfo {
   info [

src/controller/launcher/Makefile

@@ -41,8 +41,30 @@ endif
 
 release debug profile: $(CONTROLLER_LAUNCHER)
 
+ifeq ($(OSTYPE),darwin)
+
+OBJDIR = build/$(MAKECMDGOALS)
+BUILD_PATH_SETUP := $(shell mkdir -p $(OBJDIR)/x86_64 $(OBJDIR)/arm64)
+
+$(CONTROLLER_LAUNCHER): $(OBJDIR)/x86_64/webots-controller $(OBJDIR)/arm64/webots-controller
+	@echo "# creating fat " $(notdir $@)
+	@lipo -create -output $@ $(OBJDIR)/x86_64/webots-controller $(OBJDIR)/arm64/webots-controller
+	@codesign -s - $@
+
+$(OBJDIR)/x86_64/webots-controller: webots_controller.c
+	@echo "# compiling " $@ "(x64_64)"
+	@gcc $(CFLAGS) -target x86_64-apple-macos12 webots_controller.c -o $@
+
+$(OBJDIR)/arm64/webots-controller: webots_controller.c
+	@echo "# compiling " $@ "(arm64)"
+	@gcc $(CFLAGS) -target arm64-apple-macos12 webots_controller.c -o $@
+
+else
+
 $(CONTROLLER_LAUNCHER): webots_controller.c
 	@echo "# compiling" $<
 	@gcc $(CFLAGS) webots_controller.c -o $@
 
+endif
+
 FILES_TO_REMOVE += $(CONTROLLER_LAUNCHER)

src/wren/FileImport.cpp

@@ -271,7 +271,7 @@ namespace wren {
           aiMaterial *material = scene->mMaterials[materialIndex];
           aiString name;
           material->Get(AI_MATKEY_NAME, name);
-          char *matName = new char[strlen(name.C_Str())];
+          char *matName = new char[strlen(name.C_Str()) + 1];
           strcpy(matName, name.C_Str());
           materials.push_back(matName);
         }