Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions .github/workflows/scripts/update_version.py

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/unit_test_addon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
strategy:
fail-fast: false
matrix:
blender-version: ["4.0", "3.6", "3.3"]
blender-version: ["4.2", "3.6",]
#os: [ubuntu-latest, windows-latest, macos-latest]
# FIXME Addon doesn't work on Ubuntu (don't know why)
# FIXME Addon tests doesn't work on Ubuntu (don't know why)
os: [windows-latest]
env:
BLENDER_CACHE: ${{ github.workspace }}/.blender_releases_cache # The place where blender releases are downloaded
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/update_version.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ __pycache__/
TextEditorExample.txt
/docs/build
/ActRec/packages
/ActRec/*.zip
/ActRec/lib
6 changes: 3 additions & 3 deletions ActRec/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
bl_info = {
"name": "ActionRecorder",
"author": "InamuraJIN, RivinHD",
"version": (4, 1, 2),
"blender": (3, 3, 12),
"version": (4, 2, 0),
"blender": (4, 2, 0),
"location": "View 3D",
"warning": "",
"docs_url": 'https://github.com/InamuraJIN/ActionRecorder/blob/master/README.md', # Documentation
"docs_url": 'https://inamurajin.github.io/ActionRecorder/', # Documentation
"tracker_url": 'https://inamurajin.wixsite.com/website/post/bug-report', # Report Bug
"link": 'https://twitter.com/Inamura_JIN',
"category": "System"
Expand Down
19 changes: 16 additions & 3 deletions ActRec/actrec/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# region Imports
# external modules
import json
import os
import shutil

# blender modules
import bpy
Expand All @@ -10,7 +12,7 @@
# relative imports
# unused import needed to give direct access to the modules
from . import functions, menus, operators, panels, properties, ui_functions, uilist
from . import config, icon_manager, keymap, log, preferences, update
from . import config, icon_manager, keymap, log, preferences
from .functions.shared import get_preferences
from . import shared_data
# endregion
Expand All @@ -35,6 +37,12 @@ def on_load(dummy=None):
context = bpy.context
ActRec_pref = get_preferences(context)
ActRec_pref.operators_list_length = 0

# Copy Storage.json for first startup from addon source directory to user directory
if not os.path.exists(ActRec_pref.storage_path):
source_storage_path = os.path.join(ActRec_pref.source_addon_directory, "Storage.json")
shutil.copyfile(source_storage_path, ActRec_pref.storage_path) # copy the file

# load local actions
if bpy.data.filepath == "":
try:
Expand Down Expand Up @@ -70,6 +78,13 @@ def on_load(dummy=None):
icon_manager.load_icons(ActRec_pref)
log.logger.info("Finished: Load ActRec Data")

if bpy.app.version < (4, 2, 0):
success = functions.install_wheels(ActRec_pref)
if success:
log.logger.info("Successfully installed and loaded wheels")
else:
log.logger.error("Failed to install or load wheels")

# region Registration


Expand All @@ -81,7 +96,6 @@ def register():
panels.register()
uilist.register()
icon_manager.register()
update.register()
preferences.register()
keymap.register()

Expand All @@ -104,7 +118,6 @@ def unregister():
panels.unregister()
uilist.unregister()
icon_manager.unregister()
update.unregister()
preferences.unregister()
keymap.unregister()
ui_functions.unregister()
Expand Down
1 change: 0 additions & 1 deletion ActRec/actrec/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
check_source_url = 'https://raw.githubusercontent.com/InamuraJIN/ActionRecorder/master/download_file.json'
repo_source_url = 'https://raw.githubusercontent.com/InamuraJIN/ActionRecorder/master/%s'
release_notes_url = 'https://github.com/InamuraJIN/ActionRecorder/wiki'
version = (4, 1, 2)
log_amount = 5
4 changes: 2 additions & 2 deletions ActRec/actrec/functions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
execute_render_complete,
enum_list_id_to_name_dict,
enum_items_to_enum_prop_list,
install_packages,
get_preferences,
get_categorized_view_3d_modes,
get_attribute,
get_attribute_default
get_attribute_default,
install_wheels
)
Loading