diff --git a/addons/io_hubs_addon/components/operators.py b/addons/io_hubs_addon/components/operators.py index dd3bab4b..7fa9ca29 100644 --- a/addons/io_hubs_addon/components/operators.py +++ b/addons/io_hubs_addon/components/operators.py @@ -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): @@ -635,13 +635,8 @@ 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'} @@ -649,14 +644,14 @@ def execute(self, context): 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) @@ -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'}