From aa85019b485bd73ecc3681ea7b0a1030c57441a3 Mon Sep 17 00:00:00 2001 From: matyalatte Date: Sat, 5 Oct 2024 18:02:55 +0900 Subject: [PATCH 1/5] fix a bug where DLL changes locale settings on Windows Removed locale settings from DLL to fix a crash when changing viewport shading after using DDS addon with Blender 4.2 on Windows. --- changelog.txt | 3 +++ external/Texconv-Custom-DLL | 2 +- for_dev/lint.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 41fd043..1a438fd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +ver 0.4.3 +- Fixed a bug where DLL changed locale settings on Windows. + ver 0.4.2 - Updated DirectXTex to June2024 release (including fix for HDR codec to avoid buffer overread for some malformed files) diff --git a/external/Texconv-Custom-DLL b/external/Texconv-Custom-DLL index 9f03f0f..1ecd416 160000 --- a/external/Texconv-Custom-DLL +++ b/external/Texconv-Custom-DLL @@ -1 +1 @@ -Subproject commit 9f03f0f418c8f038f1a798fa15f8d621664e0ffa +Subproject commit 1ecd416b95e5b6f4e9d61bcf72781adb6f5ff0d8 diff --git a/for_dev/lint.py b/for_dev/lint.py index cd8861c..6dfef75 100644 --- a/for_dev/lint.py +++ b/for_dev/lint.py @@ -31,7 +31,7 @@ def get_args(): f'Path: {path} | ' f'Threshold: {threshold} ') - results = Run([path], do_exit=False) + results = Run([path], exit=False) score = results.linter.stats.global_note score_msg = f'Score: {score} | Threshold: {threshold} ' From 0954091109de166418652cdae3f4b7f47e45e8ea Mon Sep 17 00:00:00 2001 From: matyalatte Date: Sat, 5 Oct 2024 18:07:28 +0900 Subject: [PATCH 2/5] increment version number --- addons/blender_dds_addon/__init__.py | 2 +- docs/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/blender_dds_addon/__init__.py b/addons/blender_dds_addon/__init__.py index 7c72bfa..34f6a7d 100644 --- a/addons/blender_dds_addon/__init__.py +++ b/addons/blender_dds_addon/__init__.py @@ -10,7 +10,7 @@ bl_info = { 'name': 'DDS textures', 'author': 'Matyalatte', - 'version': (0, 4, 2), + 'version': (0, 4, 3), 'blender': (2, 83, 20), 'location': 'Image Editor > Sidebar > DDS Tab', 'description': 'Import and export .dds files', diff --git a/docs/README.md b/docs/README.md index 4428992..692d363 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# Blender-DDS-Addon v0.4.2 +# Blender-DDS-Addon v0.4.3 [![Github All Releases](https://img.shields.io/github/downloads/matyalatte/Blender-DDS-Addon/total.svg)]() [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) From aa2c5125105609d076b77a856fca8e663ea100f3 Mon Sep 17 00:00:00 2001 From: matyalatte Date: Sat, 5 Oct 2024 18:12:33 +0900 Subject: [PATCH 3/5] test with Blender4.2, update macos runner --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c7b5c4..e2d2d1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: build: strategy: matrix: - os: [windows-2022, ubuntu-20.04, macos-11] + os: [windows-2022, ubuntu-20.04, macos-14] runs-on: ${{ matrix.os }} needs: setup steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0afbf2f..4cee70b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,9 +40,9 @@ jobs: fail-fast: false matrix: include: - # Test with 2.83, 3.3, 3.6, and 4.1 on Windows + # Test with 2.83, 3.3, 3.6, and 4.2 on Windows - platform: windows-latest - blender-version: '4.1.1' + blender-version: '4.2.2' - platform: windows-latest blender-version: '3.6.11' From 6d95380f29b52aac5b7443243d824618d29ca138 Mon Sep 17 00:00:00 2001 From: matyalatte Date: Sat, 5 Oct 2024 18:51:12 +0900 Subject: [PATCH 4/5] set deployment target to texconv on macos --- external/Texconv-Custom-DLL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Texconv-Custom-DLL b/external/Texconv-Custom-DLL index 1ecd416..9779c21 160000 --- a/external/Texconv-Custom-DLL +++ b/external/Texconv-Custom-DLL @@ -1 +1 @@ -Subproject commit 1ecd416b95e5b6f4e9d61bcf72781adb6f5ff0d8 +Subproject commit 9779c218cb0dbd1f8ffd277d9c9e179d18b2efa1 From c1cdc5cb324e6774cdb5cf9ae987aa1068586142 Mon Sep 17 00:00:00 2001 From: matyalatte Date: Sat, 5 Oct 2024 19:41:49 +0900 Subject: [PATCH 5/5] add architecture info to package name --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d2d1c..3a740c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,13 @@ jobs: build: strategy: matrix: - os: [windows-2022, ubuntu-20.04, macos-14] + include: + - os: windows-2022 + arch_suffix: -x64 + - os: ubuntu-20.04 + arch_suffix: -x64 + - os: macos-14 + arch_suffix: "" runs-on: ${{ matrix.os }} needs: setup steps: @@ -84,10 +90,10 @@ jobs: with: directory: 'release' type: 'zip' - filename: '${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.zip' + filename: '${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}${{ matrix.arch_suffix }}.zip' exclusions: '*.git* .gitignore' - name: Upload Release Asset env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh release upload ${{ needs.setup.outputs.tag }} release/${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.zip + run: gh release upload ${{ needs.setup.outputs.tag }} release/${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}${{ matrix.arch_suffix }}.zip