From 614957a471de71d8ce31b80230786943f3f35fcd Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Sat, 26 Aug 2023 14:21:36 +0200 Subject: [PATCH 1/2] fix(pyrender): Only enables headless pyrender under linux --- blenderproc/python/writer/BopWriterUtility.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blenderproc/python/writer/BopWriterUtility.py b/blenderproc/python/writer/BopWriterUtility.py index 60f0b6694..b6ec492cb 100644 --- a/blenderproc/python/writer/BopWriterUtility.py +++ b/blenderproc/python/writer/BopWriterUtility.py @@ -13,6 +13,7 @@ import cv2 import bpy from mathutils import Matrix +import sys from blenderproc.python.types.MeshObjectUtility import MeshObject, get_all_mesh_objects from blenderproc.python.utility.Utility import Utility, resolve_path @@ -22,7 +23,9 @@ 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 From e846938d85397fa9bfae561bf66862fa4973ddbf Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Sat, 26 Aug 2023 14:41:09 +0200 Subject: [PATCH 2/2] chore(changelog): Adds changelog for 2.6.1 --- blenderproc/version.py | 2 +- change_log.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/blenderproc/version.py b/blenderproc/version.py index 32333bfda..a77fa85d6 100644 --- 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 index 9ea964c6e..2959ad8a4 100644 --- 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: