Merge remote-tracking branch 'origin/r2.6' into main

DLR-RM · Aug 26, 2023 · c700811 · c700811
2 parents 5bc7468 + e846938
commit c700811
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/blenderproc/python/writer/BopWriterUtility.py b/blenderproc/python/writer/BopWriterUtility.py
@@ -12,14 +12,17 @@
 import cv2
 import bpy
 from mathutils import Matrix
+import sys
 
 from blenderproc.python.types.MeshObjectUtility import MeshObject, get_all_mesh_objects
 from blenderproc.python.writer.WriterUtility import _WriterUtility
 from blenderproc.python.types.LinkUtility import Link
 from blenderproc.python.utility.SetupUtility import SetupUtility
 from blenderproc.python.utility.MathUtility import change_target_coordinate_frame_of_transformation_matrix
 
-os.environ['PYOPENGL_PLATFORM'] = 'egl'
+# EGL is not available under windows
+if sys.platform in ["linux", "linux2"]:
+    os.environ['PYOPENGL_PLATFORM'] = 'egl'
 # pylint: disable=wrong-import-position
 import pyrender
 # pylint: enable=wrong-import-position

diff --git a/blenderproc/version.py b/blenderproc/version.py
@@ -1,2 +1,2 @@
 """ Define the current BlenderProc version. """
-__version__ = '2.6.0'
+__version__ = '2.6.1'
diff --git a/change_log.md b/change_log.md
@@ -7,6 +7,10 @@
 
 # Version History
 
+## Version 2.6.1 26th August 2023
+
+- Fixes pyrender usage on windows, EGL / headless rendering is now only used on linux
+
 ## Version 2.6.0 17th August 2023
 
 - BOP toolkit is now tightly integrated into the the BOP writer: