ks: add completions for bash and zsh (#364049)
[NixPkgs.git] / pkgs / applications / misc / blender / draco.patch
bloba5abed18453f524450259d15b79a08e1aecd62ad
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 97596dbee8d..d1ad6ac5de0 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -1237,13 +1237,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
6 set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
7 set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF)
9 -if(NOT WITH_PYTHON_MODULE)
10 - if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
11 - message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
12 - set(WITH_DRACO OFF)
13 - endif()
14 -endif()
16 # enable boost for cycles, audaspace or i18n
17 # otherwise if the user disabled
19 diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
20 index 75e23162c67..875596c3d2f 100644
21 --- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py
22 +++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
23 @@ -31,8 +31,8 @@ def dll_path() -> Path:
24 :return: DLL path.
25 """
26 lib_name = 'extern_draco'
27 - blender_root = Path(bpy.app.binary_path).parent
28 - python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
29 + blender_root = Path(bpy.app.binary_path).parent.parent
30 + python_lib = Path('share/blender/{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
31 python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
33 path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')