From 614957a471de71d8ce31b80230786943f3f35fcd Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Sat, 26 Aug 2023 14:21:36 +0200 Subject: [PATCH 1/5] 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/5] 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: From e174dd222b60479f0279a6cc9ef06b061edd4761 Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Thu, 31 Aug 2023 09:10:07 +0200 Subject: [PATCH 3/5] fix(windows): Fixes usage of custom blender path on windows --- blenderproc/python/utility/InstallUtility.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blenderproc/python/utility/InstallUtility.py b/blenderproc/python/utility/InstallUtility.py index 47388e4ae..6c6394fba 100644 --- a/blenderproc/python/utility/InstallUtility.py +++ b/blenderproc/python/utility/InstallUtility.py @@ -97,7 +97,8 @@ def make_sure_blender_is_installed(custom_blender_path: str, blender_install_pat elif platform == "win32": blender_version += "-windows-x64" blender_install_path = os.path.join(blender_install_path, blender_version) - blender_path = blender_install_path + # After unpacking there is another subfolder named blender_version + blender_path = os.path.join(blender_install_path, blender_version) else: raise RuntimeError(f"This system is not supported yet: {platform}") @@ -218,7 +219,7 @@ def __call__(self, block_num, block_size, total_size): elif platform == "darwin": blender_run_path = os.path.join(blender_path, "Contents", "MacOS", "Blender") elif platform == "win32": - blender_run_path = os.path.join(blender_install_path, blender_version, "blender") + blender_run_path = os.path.join(blender_path, "blender") else: raise RuntimeError(f"This system is not supported yet: {platform}") From 83db1deafae5f9233b49ad2bd202b68ae2b3623b Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Mon, 11 Sep 2023 10:47:41 +0200 Subject: [PATCH 4/5] fix(download): Fixes cc textures download link --- blenderproc/scripts/download_cc_textures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blenderproc/scripts/download_cc_textures.py b/blenderproc/scripts/download_cc_textures.py index e48d87c9c..9d89c0780 100644 --- a/blenderproc/scripts/download_cc_textures.py +++ b/blenderproc/scripts/download_cc_textures.py @@ -46,7 +46,7 @@ def cli(): for download_attr in current_download_dict["zip"]["downloads"]: if "attribute" in download_attr and download_attr["attribute"] == "2K-JPG": data[asset["assetId"]] = ( - download_attr["fullDownloadPath"], download_attr["zipContent"]) + download_attr["downloadLink"], download_attr["zipContent"]) else: print(f"No zip or downloads found for asset: {asset['assetId']}") else: From 455cc0a76990a5e5a9395e4f2c2bfb3d76a1020c Mon Sep 17 00:00:00 2001 From: Dominik Winkelbauer Date: Thu, 28 Sep 2023 16:20:23 +0200 Subject: [PATCH 5/5] chore(cla): Adds fortminors --- .clabot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clabot b/.clabot index 45f5ad1be..eea9a104b 100644 --- a/.clabot +++ b/.clabot @@ -1,5 +1,5 @@ { - "contributors": ["MartinSmeyer", "themasterlink", "cornerfarmer", "wboerdijk", "MarkusKnauer", "maximilianmuehlbauer", "wangg12", "alexander-soare", "heilaw", "5trobl", "marcelhohn", "ffurrer", "apenzko", "Victorlouisdg", "MarwinNumbers", "jascase901", "muedavid", "andrewyguo", "YouJiacheng", "Sebastian-Jung", "stevenpclark", "jung-se", "hansaskov", "HectorAnadon", "NnamdiN", "eliphatfs", "saprrow", "woodbridge"], + "contributors": ["MartinSmeyer", "themasterlink", "cornerfarmer", "wboerdijk", "MarkusKnauer", "maximilianmuehlbauer", "wangg12", "alexander-soare", "heilaw", "5trobl", "marcelhohn", "ffurrer", "apenzko", "Victorlouisdg", "MarwinNumbers", "jascase901", "muedavid", "andrewyguo", "YouJiacheng", "Sebastian-Jung", "stevenpclark", "jung-se", "hansaskov", "HectorAnadon", "NnamdiN", "eliphatfs", "saprrow", "woodbridge", "fortminors"], "message": "For contributing to BlenderProc you need to sign our Contributor License Agreement. As an individual please sign [CLA_individuals.pdf](https://github.com/DLR-RM/BlenderProc/blob/main/CLA_individuals.pdf), as a company please sign [CLA_entities.pdf](https://github.com/DLR-RM/BlenderProc/blob/main/CLA_entities.pdf) and send it to blenderproc@dlr.de", "label": "cla-signed" }