From 7248db3736aaeaf31baf2771d15e3d650f4c7224 Mon Sep 17 00:00:00 2001 From: Natsune Mochizuki Date: Fri, 28 Jul 2023 19:24:33 +0900 Subject: [PATCH 1/2] feat: support to Blender 3.6.1 --- src/blender-injection/BlenderPatchPatterns.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/blender-injection/BlenderPatchPatterns.h b/src/blender-injection/BlenderPatchPatterns.h index 31ca44e..8eb5376 100644 --- a/src/blender-injection/BlenderPatchPatterns.h +++ b/src/blender-injection/BlenderPatchPatterns.h @@ -60,6 +60,7 @@ struct BlenderPatchPattern // XXX: LEA RDX, QWORD PTR [RSP+30H] // RDX = ptr:[addon_utils, NULL] // XXX: MOV RCX, RSI // RCX = ptr:C // XXX: CALL 00007FF61FF9E3A0H <- here // BPY_run_string_eval(RCX, RDX, R8) +// XXX: CALL 00007FF61FF9E3C0H // // // // FUNCTION LOCATION - view3d_ima_empty_drop_poll / view3d_id_path_drop_copy (search: "OBJECT_OT_drop_named_image" as ANSI string) @@ -216,8 +217,16 @@ static std::unordered_map Patchers{ }, { "3.6.0", { - "E8 FC 8F 41 00 E8 C7 AD 22 04", // CALL and CALL - // "E8 DE 2F 41 00 40 84 F6", // CALL and TEST + "E8 FC 8F 41 00 E8 C7 AD 22 04", + "4C 8D 05 F9 07 00 00", + "E8 7B FF FF FF 84 C0", + "E8 EB BD 00 00 48 85 C0" + } + }, + { + + "3.6.1", { + "E8 AC 90 41 00 E8 B7 AA 22 04", "4C 8D 05 F9 07 00 00", "E8 7B FF FF FF 84 C0", "E8 EB BD 00 00 48 85 C0" From 04f5a43f7fd81c129bcf585083b2bb1af64805b6 Mon Sep 17 00:00:00 2001 From: Natsune Mochizuki Date: Sun, 30 Jul 2023 21:42:08 +0900 Subject: [PATCH 2/2] chore: release v2.8.0 --- .github/ISSUE_TEMPLATE/bug-report.yml | 3 +++ README.md | 1 + src/blender-extension/__init__.py | 9 ++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 7786bf1..5d1d555 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -32,6 +32,8 @@ body: - 2.5.0 - 2.6.0 - 2.7.0 + - 2.7.1 + - 2.8.0 validations: required: true - type: dropdown @@ -57,6 +59,7 @@ body: - 3.5.0 - 3.5.1 - 3.6.0 + - 3.6.1 - edge - type: textarea id: logs diff --git a/README.md b/README.md index f44a0e9..d6f4867 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ v2.0.0 supports the following versions of Blender: - Blender 3.5.0 (x64 - Windows) - Blender 3.5.1 (x64 - Windows) - Blender 3.6.0 (x64 - Windows) +- Blender 3.6.1 (x64 - Windows) ## Installation diff --git a/src/blender-extension/__init__.py b/src/blender-extension/__init__.py index 0ff0de1..574662b 100644 --- a/src/blender-extension/__init__.py +++ b/src/blender-extension/__init__.py @@ -11,15 +11,16 @@ "author": "Natsuneko", "description": "Blender add-on for import some files from drag-and-drop", "blender": (3, 1, 0), - "version": (2, 7, 0), + "version": (2, 8, 0), "location": "Drag and Drop Support", "warning": "", - "category": "Import-Export" + "category": "Import-Export", } if "bpy" in locals(): import importlib + importlib.reload(operator) importlib.reload(properties) importlib.reload(ui) @@ -58,7 +59,8 @@ def register(): bpy.utils.register_class(c) bpy.types.Scene.DragAndDropSupportProperties = PointerProperty( - type=properties.DragAndDropSupportProperties) + type=properties.DragAndDropSupportProperties + ) import os @@ -78,6 +80,7 @@ def unregister(): del bpy.types.Scene.DragAndDropSupportProperties import _ctypes + _ctypes.FreeLibrary(dll._handle)