diff --git a/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate b/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate index 8a39eec4e..9ff7dfe8c 100644 Binary files a/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate and b/Acid.Cam.v2.OSX.xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Acid.Cam.v2.OSX/AC_Controller.mm b/Acid.Cam.v2.OSX/AC_Controller.mm index d32a2b690..d6764e62a 100644 --- a/Acid.Cam.v2.OSX/AC_Controller.mm +++ b/Acid.Cam.v2.OSX/AC_Controller.mm @@ -1314,10 +1314,16 @@ - (IBAction) selectImage: (id) sender { NSOpenPanel *panel = [NSOpenPanel openPanel]; [panel setCanChooseDirectories:NO]; [panel setCanChooseFiles: YES]; - [panel setAllowedFileTypes: [NSArray arrayWithObjects: @"jpg", @"png", nil]]; + [panel setAllowsMultipleSelection: YES]; + [panel setAllowedFileTypes: [NSArray arrayWithObjects: @"bmp",@"jpg", @"png", nil]]; if([panel runModal]) { - NSString *file_name = [[panel URL] path]; - [image_combo addItemWithObjectValue: file_name]; + NSArray *file_names = [panel URLs]; + if([file_names count] > 0) { + for(unsigned int i = 0; i < [file_names count]; ++i) { + NSURL *file_n = [file_names objectAtIndex:i]; + [image_combo addItemWithObjectValue: [file_n path]]; + } + } } } - (IBAction) setAsImage: (id) sender { diff --git a/colorkeyed_images/star_cutout.png b/colorkeyed_images/star_cutout.png new file mode 100644 index 000000000..169d3ffd4 Binary files /dev/null and b/colorkeyed_images/star_cutout.png differ