Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mika-f committed Dec 31, 2023
2 parents 16c040a + caf45fb commit a9d0d52
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@ body:
- 3.6.4
- 3.6.5
- 4.0.0
- 4.0.1
- 4.0.2
- edge
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
17 changes: 17 additions & 0 deletions .vscode/recommended.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"folders": [
{
"name": "repository",
"path": ".."
},
{
"name": "python-addon",
"path": "../src/addon"
},
{
"name": "native-addon",
"path": "../src/dll"
}
],
"settings": {}
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/addon/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/addon/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
]

Expand Down
21 changes: 20 additions & 1 deletion src/dll/BlenderPatchPatterns.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,32 @@ static std::unordered_map<std::string, BlenderPatchPattern> 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",
"4C 8D 05 09 0A 00 00",
"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
};

0 comments on commit a9d0d52

Please sign in to comment.