Skip to content

Commit

Permalink
Merge pull request #28 from matyalatte/fix_locale
Browse files Browse the repository at this point in the history
Fix a bug where DLL changes locale settings on Windows.
  • Loading branch information
matyalatte authored Oct 5, 2024
2 parents 55bde86 + c1cdc5c commit cbb9aae
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 9 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ jobs:
build:
strategy:
matrix:
os: [windows-2022, ubuntu-20.04, macos-11]
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:
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion addons/blender_dds_addon/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion external/Texconv-Custom-DLL
2 changes: 1 addition & 1 deletion for_dev/lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -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} '
Expand Down

0 comments on commit cbb9aae

Please sign in to comment.