Skip to content

[pull] main from lampysprites:main #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[pull] main from lampysprites:main #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def poll(self, context):
return addon.connected and addon.state.uv_watch == 'NEVER'

def invoke(self, context, event):
bpy.ops.pribambase.uv_send('INVOKE_DEFAULT')
bpy.ops.pribambase.uv_send('EXEC_DEFAULT')
return {'CANCELLED'}


Expand Down
18 changes: 9 additions & 9 deletions messaging/handle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async def execute(self, *, size:Tuple[int, int], frame:int, flags:Set[str], name
if not bpy.context.window_manager.is_interface_locked:
modify.image(size[0], size[1], name, frame, flags, data)
else:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, image update skipped")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, image update skipped")
except AttributeError:
# blender 2.80... if it crashes, it crashes :\
modify.image(size[0], size[1], name, frame, flags, data)
Expand Down Expand Up @@ -126,7 +126,7 @@ async def execute(self, *, size:Tuple[int, int], name:str, start:int, length:int
if not bpy.context.window_manager.is_interface_locked:
modify.spritesheet(size, (count_x, count_y), name, start, frames, tags, current_frame, current_tag, sheet_data)
else:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, image update skipped")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, image update skipped")
except AttributeError:
# version 2.80... caveat emptor
modify.spritesheet(size, (count_x, count_y), name, start, frames, tags, current_frame, current_tag, sheet_data)
Expand All @@ -149,7 +149,7 @@ async def execute(self, frame:int, name:str, start:int, frames:List[Tuple[int, i
if not bpy.context.window_manager.is_interface_locked:
modify.frame(name, frame, start, frames)
else:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, frame flip skipped")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, frame flip skipped")
except AttributeError:
# version 2.80... caveat emptor
modify.frame(name, frame, start, frames)
Expand Down Expand Up @@ -194,7 +194,7 @@ async def execute(self, width:int, height:int, name:str, flags:Set[str], groups:
if not bpy.context.window_manager.is_interface_locked:
modify.image_layers(width, height, name, flags, groups, layers)
else:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, image update skipped")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, image update skipped")
except AttributeError:
# version 2.80... caveat emptor
modify.image_layers(width, height, name, flags, groups, layers)
Expand All @@ -213,7 +213,7 @@ async def execute(self, *, old_name, new_name):
try:
# FIXME there's a risk of race condition but it's pretty bad if the rename doesn't happen
while bpy.context.window_manager.is_interface_locked:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, waiting to update image source..")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, waiting to update image source..")
asyncio.sleep(0.1)
except AttributeError:
# version 2.80... caveat emptor
Expand All @@ -229,7 +229,7 @@ async def execute(self, *, old_name, new_name):
else:
img.filepath_raw = ""

bpy.ops.pribambase.send_texture_list()
bpy.ops.pribambase.send_texture_list('EXEC_DEFAULT')


class NewTexture(Handler):
Expand All @@ -245,12 +245,12 @@ def parse(self, args):
async def execute(self, *, name:str, path:str, sheet:bool, layers:bool):
try:
if not bpy.context.window_manager.is_interface_locked:
bpy.ops.pribambase.new_texture(name=name, path=path, sheet=sheet, layers=layers)
bpy.ops.pribambase.new_texture('EXEC_DEFAULT', name=name, path=path, sheet=sheet, layers=layers)
else:
bpy.ops.pribambase.report(message_type='WARNING', message="UI is locked, image update skipped")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='WARNING', message="UI is locked, image update skipped")
except AttributeError:
# blender 2.80... if it crashes, it crashes :\
bpy.ops.pribambase.new_texture(name=name, path=path, sheet=sheet, layers=layers)
bpy.ops.pribambase.new_texture('EXEC_DEFAULT', name=name, path=path, sheet=sheet, layers=layers)


class ActiveSprite(Handler):
Expand Down
12 changes: 6 additions & 6 deletions modify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def image(w, h, name, frame, flags, pixels):
# NOTE this operator removes animation flag from image
global _update_image_args
_update_image_args = w, h, name, frame, flags, pixels
bpy.ops.pribambase.update_image()
bpy.ops.pribambase.update_image('EXEC_DEFAULT')

class SB_OT_update_image(bpy.types.Operator, ModalExecuteMixin):
bl_idname = "pribambase.update_image"
Expand Down Expand Up @@ -119,7 +119,7 @@ def image_layers(width, height, name, flags, groups, layers):
# NOTE this operator removes animation flag from image
global _update_layers_args
_update_layers_args = width, height, name, flags, groups, layers
bpy.ops.pribambase.update_image_layers()
bpy.ops.pribambase.update_image_layers('EXEC_DEFAULT')

class SB_OT_update_image_layers(bpy.types.Operator, ModalExecuteMixin):
bl_idname = "pribambase.update_image_layers"
Expand Down Expand Up @@ -239,7 +239,7 @@ def spritesheet(size, count, name, start, frames, tags, current_frame, current_t
# NOTE this function sets animation flag
global _update_spritesheet_args
_update_spritesheet_args = size, count, name, start, frames, tags, current_frame, current_tag, pixels
bpy.ops.pribambase.update_spritesheet()
bpy.ops.pribambase.update_spritesheet('EXEC_DEFAULT')

class SB_OT_update_spritesheet(bpy.types.Operator, ModalExecuteMixin):
bl_idname = "pribambase.update_spritesheet"
Expand Down Expand Up @@ -456,7 +456,7 @@ def frame(name, frame, start, frames):
# NOTE this operator removes animation flag from image
global _update_frame_args
_update_frame_args = name, frame, start, frames
bpy.ops.pribambase.update_frame()
bpy.ops.pribambase.update_frame('EXEC_DEFAULT')

class SB_OT_update_frame(bpy.types.Operator, ModalExecuteMixin):
bl_idname = "pribambase.update_frame"
Expand Down Expand Up @@ -542,7 +542,7 @@ class SB_OT_new_texture(bpy.types.Operator, ModalExecuteMixin):

def modal_execute(self, context):
if self.path:
bpy.ops.pribambase.sprite_open(filepath=self.path, relative=addon.prefs.use_relative_path, sheet=self.sheet, layers=self.layers)
bpy.ops.pribambase.sprite_open('EXEC_DEFAULT', filepath=self.path, relative=addon.prefs.use_relative_path, sheet=self.sheet, layers=self.layers)
else:
flags = set()
if self.layers:
Expand All @@ -560,6 +560,6 @@ def modal_execute(self, context):

img.sb_props.source=self.name
img.sb_props.sync_flags = flags
bpy.ops.pribambase.send_texture_list()
bpy.ops.pribambase.send_texture_list('EXEC_DEFAULT')

return {'FINISHED'}
6 changes: 3 additions & 3 deletions sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ async def _receive(self, request) -> WebSocketResponse:

# client connected
await self._ws.send_bytes(encode.texture_list(addon.state.identifier, addon.texture_list), False)
bpy.ops.pribambase.report(message_type='INFO', message="Aseprite connected")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='INFO', message="Aseprite connected")
self.ev_connect.set()

if addon.prefs.uv_sync_auto:
Expand All @@ -122,15 +122,15 @@ async def _receive(self, request) -> WebSocketResponse:
await addon.handlers.process(msg.data)

elif msg.type == aiohttp.WSMsgType.ERROR:
bpy.ops.pribambase.report(message_type='ERROR', message=f"Aseprite connection closed with exception {self._ws.exception()}")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='ERROR', message=f"Aseprite connection closed with exception {self._ws.exception()}")

# client disconnected

if addon.watch:
addon.watch.stop()
addon.watch = None

bpy.ops.pribambase.report(message_type='INFO', message="Aseprite disconnected")
bpy.ops.pribambase.report('EXEC_DEFAULT', message_type='INFO', message="Aseprite disconnected")
util.refresh()

return self._ws
Expand Down