Merge remote-tracking branch 'origin/main' into iss_blender_3.4.1

.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 [email protected]",
   "label": "cla-signed"
 }

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}")
 

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

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:

blenderproc/version.py

@@ -1,2 +1,2 @@
 """ Define the current BlenderProc version. """
-__version__ = '2.6.0'
+__version__ = '2.6.1'

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: