Skip to content

Commit

Permalink
Cosmetics Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Spiderguy-F committed Mar 14, 2024
1 parent f4166b6 commit 3568f5e
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions addons/io_hubs_addon/components/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ def invoke(self, context, event):


def split_and_prefix_report_messages(report_string):
return [f"{i+1:02d} {message}" for i, message in enumerate(report_string.split("\n\n"))]
return [f"{i + 1:02d} {message}" for i, message in enumerate(report_string.split("\n\n"))]


class CopyHubsComponent(Operator):
Expand Down Expand Up @@ -635,28 +635,23 @@ def poll(cls, context):
return False

return True

def draw(self, context): #this def is obsolete, bc. target_property is hidden by default now and relative_path is displayed by default anyways
layout = self.layout
layout.prop(self, "relative_path")


def execute(self, context):
#dirname = os.path.dirname(self.filepath) #dirname fails if path selected in the Blender File View is relative (starts with //) on Windows
if not self.files[0].name:
self.report({'INFO'}, "Open image cancelled. No image selected.")
return {'CANCELLED'}

old_img = getattr(self.target, self.target_property)

# Load/Reload the first image and assign it to the target property, then load the rest of the images if they're not already loaded. This mimics Blender's default open files behavior.
primary_filepath = os.path.join(self.directory, self.files[0].name) #self.files is sorted alphabetically by Blender, self.files[0] is the 1. of the selection in alphabetical order
primary_filepath = os.path.join(self.directory, self.files[0].name) # self.files is sorted alphabetically by Blender, self.files[0] is the 1. of the selection in alphabetical order
primary_img = bpy.data.images.load(
filepath=primary_filepath, check_existing=True)
primary_img.reload()
setattr(self.target, self.target_property, primary_img)

for f in self.files[1:]:
bpy.data.images.load(filepath=os.path.join( #join works with both relative and absolute paths
bpy.data.images.load(filepath=os.path.join(
self.directory, f.name), check_existing=True)

update_image_editors(old_img, primary_img)
Expand All @@ -665,11 +660,11 @@ def execute(self, context):

def invoke(self, context, event):
self.target = context.target

last_image = getattr(self.target, self.target_property)
if type(last_image) == bpy.types.Image: #if the component has been assigned before, get its filepath
self.filepath = last_image.filepath #start the file browser at the location of the previous file
if type(last_image) is bpy.types.Image: # if the component has been assigned before, get its filepath
self.filepath = last_image.filepath # start the file browser at the location of the previous file

context.window_manager.fileselect_add(self)
return {'RUNNING_MODAL'}

Expand Down

0 comments on commit 3568f5e

Please sign in to comment.