diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index f870572..29a584d 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -42,6 +42,7 @@ body: - 3.0.0-alpha.1 - 3.0.0-alpha.2 - 3.0.0-alpha.3 + - 3.0.0-alpha.4 validations: required: true - type: dropdown @@ -72,6 +73,8 @@ body: - 3.6.4 - 3.6.5 - 4.0.0 + - 4.0.1 + - 4.0.2 - edge - type: textarea id: logs diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 3471f7c..7fa00e8 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -46,4 +46,6 @@ body: - 3.6.4 - 3.6.5 - 4.0.0 + - 4.0.1 + - 4.0.2 - edge diff --git a/.gitignore b/.gitignore index e35dd9c..ef91643 100644 --- a/.gitignore +++ b/.gitignore @@ -581,6 +581,7 @@ FodyWeavers.xsd !.vscode/launch.json !.vscode/extensions.json *.code-workspace +!.vscode/recommended.code-workspace # Local History for Visual Studio Code .history/ diff --git a/.vscode/recommended.code-workspace b/.vscode/recommended.code-workspace new file mode 100644 index 0000000..9efae1e --- /dev/null +++ b/.vscode/recommended.code-workspace @@ -0,0 +1,17 @@ +{ + "folders": [ + { + "name": "repository", + "path": ".." + }, + { + "name": "python-addon", + "path": "../src/addon" + }, + { + "name": "native-addon", + "path": "../src/dll" + } + ], + "settings": {} +} diff --git a/README.md b/README.md index fb4e390..d5e9e54 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,8 @@ v2.0.0 supports the following versions of Blender: - Blender 3.6.4 (x64 - Windows) - Blender 3.6.5 (x64 - Windows) - Blender 4.0.0 (x64 - Windows) +- Blender 4.0.1 (x64 - Windows) +- Blender 4.0.2 (x64 - Windows) ## ScreenShot diff --git a/src/addon/__init__.py b/src/addon/__init__.py index e26f7b8..333fc05 100644 --- a/src/addon/__init__.py +++ b/src/addon/__init__.py @@ -11,7 +11,7 @@ "author": "Natsuneko", "description": "Blender add-on for import some files from drag-and-drop", "blender": (3, 1, 0), - "version": (2, 14, 0), + "version": (2, 15, 0), "location": "Drag and Drop Support", "doc_url": "https://docs.natsuneko.com/en-us/drag-and-drop-support/", "tracker_url": "https://github.com/mika-f/blender-drag-and-drop/issues", diff --git a/src/addon/preferences.py b/src/addon/preferences.py index 753b8cc..1b0749e 100644 --- a/src/addon/preferences.py +++ b/src/addon/preferences.py @@ -17,7 +17,7 @@ items: list[str] = [ "This addon uses C++ DLL code. Please check DLL publisher and DO NOT replace it.", "The C++ DLL hooks calls to certain functions in Blender.exe in order to receive events on drop.", - " This is the desired behavior as Blender itself does not provide any events for drops.", + "This is the desired behavior as Blender itself does not provide any events for drops.", "If you disable the add-on, these behaviors are restored.", ] diff --git a/src/dll/BlenderPatchPatterns.h b/src/dll/BlenderPatchPatterns.h index 5758a54..a057828 100644 --- a/src/dll/BlenderPatchPatterns.h +++ b/src/dll/BlenderPatchPatterns.h @@ -266,7 +266,9 @@ static std::unordered_map Patchers{ "E8 EB BD 00 00 48 85 C0", } }, -#pragma endregion +#pragma endregion // Blender 3.x + +#pragma region Blender 4.x { "4.0.0", { "E8 A9 4E 45 00", @@ -274,5 +276,22 @@ static std::unordered_map Patchers{ "E8 7B FF FF FF 84 C0", "E8 FB 26 00 00 48 85 C0" } + }, + { + "4.0.1", { + "E8 89 4E 45 00", + "4C 8D 05 09 0A 00 00", + "E8 7B FF FF FF 84 C0", + "E8 FB 26 00 00 48 85 C0" + } + }, + { + "4.0.2", { + "E8 89 54 45 00", + "4C 8D 05 09 0A 00 00", + "E8 7B FF FF FF 84 C0", + "E8 FB 26 00 00 48 85 C0" + } } +#pragma endregion // Blender 4.x };