Merge remote-tracking branch 'origin/main' into iss_1002_transparent_…

…ccmaterials_skip
DLR-RM · Dec 8, 2023 · b46390d · b46390d
2 parents 2f839ca + 6521179
commit b46390d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/blenderproc/python/types/MeshObjectUtility.py b/blenderproc/python/types/MeshObjectUtility.py
@@ -460,6 +460,7 @@ def add_uv_mapping(self, projection: str, overwrite: bool = False):
         """
         if not self.has_uv_mapping() or overwrite:
             self.edit_mode()
+            bpy.ops.mesh.select_all(action='SELECT')
             if projection == "cube":
                 bpy.ops.uv.cube_project()
             elif projection == "cylinder":

diff --git a/blenderproc/python/utility/InstallUtility.py b/blenderproc/python/utility/InstallUtility.py
@@ -12,10 +12,10 @@
 from typing import Union, Tuple
 
 if version_info.major == 3:
-    from urllib.request import urlretrieve
+    from urllib.request import urlretrieve, build_opener, install_opener
     from urllib.error import URLError
 else:
-    from urllib import urlretrieve
+    from urllib import urlretrieve, build_opener, install_opener
     import contextlib
 
 # pylint: disable=wrong-import-position
@@ -126,6 +126,12 @@ def make_sure_blender_is_installed(custom_blender_path: str, blender_install_pat
                     url = used_url + ".zip"
                 else:
                     raise RuntimeError(f"This system is not supported yet: {platform}")
+
+                # setting the default header, else the server does not allow the download
+                opener = build_opener()
+                opener.addheaders = [('User-agent', 'Mozilla/5.0')]
+                install_opener(opener)
+
                 try:
                     try:
                         # pylint: disable=import-outside-toplevel

diff --git a/blenderproc/version.py b/blenderproc/version.py
@@ -1,2 +1,2 @@
 """ Define the current BlenderProc version. """
-__version__ = '2.6.1'
+__version__ = '2.6.2'
diff --git a/change_log.md b/change_log.md
@@ -7,6 +7,10 @@
 
 # Version History
 
+## Version 2.6.2 6th December 2023
+
+- Fixes blender download 
+
 ## Version 2.6.1 26th August 2023
 
 - Fixes pyrender usage on windows, EGL / headless rendering is now only used on linux

diff --git a/docs/tutorials/loader.md b/docs/tutorials/loader.md
@@ -7,7 +7,7 @@ If don't have any data yet, BlenderProc offers download functionality for many d
 * `blenderproc download blenderkit <output_dir>`: Downloads materials and models from blenderkit
 * `blenderproc download cc_textures <output_dir>`: Downloads textures from cc0textures.com.
 * `blenderproc download haven <output_dir>`: Downloads HDRIs, Textures and Models from polyhaven.com.
-* `blenderproc download ikea <output_dir>`: Downloads the IKEA dataset. **(At the moment this dataset is not availabe!)**
+* `blenderproc download ikea <output_dir>`: Downloads the IKEA dataset. **(At the moment this dataset is not availabe! Use pix3d instead, as ikea is a subset of pix3D)**
 * `blenderproc download pix3d <output_dir>`: Downloads the Pix3D dataset.
 * `blenderproc download scenenet <output_dir>`: Downloads the scenenet dataset.
 * `blenderproc download matterport3d <output_dir>`: Downloads the Matterport3D dataset.