Skip to content

Commit

Permalink
Rename immersive scale submodule and update reference
Browse files Browse the repository at this point in the history
The submodule had the same name as the actual module when
installed, which was causing issues when installing immersive
scaler after installing cats dev. See triazo/immersive_scaler#12
  • Loading branch information
triazo committed May 19, 2022
1 parent 3596f2e commit 9b8322c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "extern_tools/immersive_scaler"]
path = extern_tools/immersive_scaler
path = extern_tools/imscale
url = git@github.com:triazo/immersive_scaler.git
12 changes: 6 additions & 6 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
if not is_reloading:
# This order is important
import mmd_tools_local
if find_spec("immersive_scaler") and find_spec("immersive_scaler.immersive_scaler"):
import immersive_scaler.immersive_scaler as imscale
if find_spec("imscale") and find_spec("imscale.immersive_scaler"):
import imscale.immersive_scaler as imscale
from . import updater
from . import tools
from . import ui
Expand Down Expand Up @@ -291,8 +291,8 @@ def register():
print('mmd_tools is already registered')

# Register immersive scaler if it's loaded
if find_spec("immersive_scaler") and find_spec("immersive_scaler.immersive_scaler"):
import immersive_scaler.immersive_scaler as imscale
if find_spec("imscale") and find_spec("imscale.immersive_scaler"):
import imscale.immersive_scaler as imscale
try:
imscale.register()
except ModuleNotFoundError:
Expand Down Expand Up @@ -374,8 +374,8 @@ def unregister():
pass

# Unload immersive scaler
if find_spec("immersive_scaler") and find_spec("immersive_scaler.immersive_scaler"):
import immersive_scaler.immersive_scaler as imscale
if find_spec("imscale") and find_spec("imscale.immersive_scaler"):
import imscale.immersive_scaler as imscale
try:
imscale.unregister()
except ModuleNotFoundError:
Expand Down
1 change: 0 additions & 1 deletion extern_tools/immersive_scaler
Submodule immersive_scaler deleted from f97530
1 change: 1 addition & 0 deletions extern_tools/imscale
Submodule imscale added at 0c0cca
6 changes: 4 additions & 2 deletions ui/scale.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ def check_for_imscale():

draw_imscale_ui = None

if find_spec("immersive_scaler") and find_spec("immersive_scaler.immersive_scaler"):
import immersive_scaler.immersive_scaler as imscale
# Check if using immersive scaler shipped with cats
if find_spec("imscale") and find_spec("imscale.immersive_scaler"):
import imscale.immersive_scaler as imscale
draw_imscale_ui = imscale.ui.draw_ui
return

# Check if it's present in blender anyway (installed separately)
for mod in addon_utils.modules():
if mod.bl_info['name'] == "Immersive Scaler":
# print(mod.__name__, mod.bl_info['version'])
Expand Down

0 comments on commit 9b8322c

Please sign in to comment.