Skip to content
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

Support both 4.2 and older versions and fix an exception #58

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support both 4.2 and older versions and fix an exception #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6b40d
Support both 4.2 and older versions
kwsxing Oct 28, 2024
59a910f
Fix an exception when clicking `File -> Defaults -> Save Startup File`
kwsxing Oct 28, 2024
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
18 changes: 16 additions & 2 deletions imagepaste/operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@
import bpy


# override the api
def bpy_ops_import_image_to_plane(*args, **kwargs):
if bpy.app.version[0] < 4 or (bpy.app.version[0] == 4 and bpy.app.version[1] < 2):
return bpy.ops.import_image.to_plane(*args, **kwargs)
# the latest api
return bpy.ops.image.import_as_mesh_planes(*args, **kwargs)

def bpy_ops_object_load_reference_image(*args, **kwargs):
if bpy.app.version[0] < 4 or (bpy.app.version[0] == 4 and bpy.app.version[1] < 2):
return bpy.ops.object.load_reference_image(*args, **kwargs)
# the latest api
return bpy.ops.object.empty_image_add(*args, **kwargs)


class IMAGEPASTE_OT_imageeditor_copy(bpy.types.Operator):
"""Copy image to the clipboard"""

Expand Down Expand Up @@ -158,7 +172,7 @@ def execute(self, _context):
if clipboard.report.type != "INFO":
return {"CANCELLED"}
for image in clipboard.images:
bpy.ops.import_image.to_plane(files=[{"name": image.filepath}])
bpy_ops_import_image_to_plane(files=[{"name": image.filepath}])
return {"FINISHED"}

@classmethod
Expand All @@ -185,7 +199,7 @@ def execute(self, _context):
if clipboard.report.type != "INFO":
return {"CANCELLED"}
for image in clipboard.images:
bpy.ops.object.load_reference_image(filepath=image.filepath)
bpy_ops_object_load_reference_image(filepath=image.filepath)
return {"FINISHED"}

@classmethod
Expand Down
3 changes: 2 additions & 1 deletion imagepaste/preferences.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ def view3d_paste_reference_imageaddmenu_draw(self, _context):
@bpy.app.handlers.persistent
def move_to_save_directory_handler(_self, _context):
"""Handler to move the images to the save directory after the file is saved."""
bpy.ops.imagepaste.move_to_save_directory("INVOKE_DEFAULT")
if bpy.ops.imagepaste.move_to_save_directory.poll():
bpy.ops.imagepaste.move_to_save_directory("INVOKE_DEFAULT")


addon_keymaps = []
Expand Down