* update blender to 17:3.1.2-2

This commit is contained in:
Alexander Baldeck 2022-06-28 20:20:23 +02:00
parent 97b2c94ab4
commit a990b11f60
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75f5795db68..d50686adfb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -754,10 +754,6 @@ endif()
set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
- set(WITH_DRACO OFF)
-endif()
# enable boost for cycles, audaspace or i18n
# otherwise if the user disabled

View File

@ -0,0 +1,21 @@
diff --git a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
index e7518ac4..c0d78564 100644
--- a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+++ b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
@@ -13,6 +13,7 @@
# limitations under the License.
import os
+import site
import sys
from pathlib import Path
import bpy
@@ -30,7 +31,7 @@ def dll_path() -> Path:
python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
- path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')
+ path = site.getsitepackages()[0]
if path is None:
path = {
'win32': blender_root / python_lib / 'site-packages',