Update main.yml

Create main.yml
2024-06-09 12:04:57 -07:00 · 2024-06-08 16:41:03 -07:00 · 2024-06-08 16:35:52 -07:00 · 2024-06-07 23:05:58 -07:00 · 2024-06-06 23:53:05 -07:00 · 2024-06-06 23:52:25 -07:00
33 changed files with 1422 additions and 392 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -0,0 +1,32 @@
 name: Verify Addon
 on:
  workflow_dispatch:
  push:
    branches: [ "main" ]
  pull_request:
    branches: [ "main" ]
 jobs:
  build:
    runs-on: ubuntu-latest
    env:
      BLENDER_VERSION: blender-4.2.0-beta+v42.d19d23e91f65-linux.x86_64-release
    steps:
      - name: Set derived environment variables
        run: |
          echo "BLENDER_FILENAME=${{ env.BLENDER_VERSION }}.tar.xz" >> $GITHUB_ENV
          echo "BLENDER_URL=https://cdn.builder.blender.org/download/daily/${{ env.BLENDER_VERSION }}.tar.xz" >> $GITHUB_ENV
      - name: Install Blender Dependencies
        run: |
          apt install libxxf86vm-dev -y
          apt install libxfixes3 -y
          apt install libxi-dev -y
          apt install libxkbcommon-x11-0 -y
          apt install libgl1-mesa-glx -y
      - name: Download Blender
        run: |
          wget $BLENDER_URL
          tar -xvzf $BLENDER_FILENAME
          rm -rf $BLENDER_FILENAME
      - uses: actions/checkout@v3
--- a/674
+++ b/674
@@ -0,0 +1,674 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <https://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -3,17 +3,20 @@
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/L4L3853VR)
-This Blender add-on allows you to import and export meshes and animations to and from the [PSK and PSA file formats](https://wiki.beyondunreal.com/PSK_%26_PSA_file_formats) used in many versions of the Unreal Engine.
+This Blender addon allows you to import and export meshes and animations to and from the [PSK and PSA file formats](https://wiki.beyondunreal.com/PSK_%26_PSA_file_formats) used in many versions of the Unreal Engine.
-## Compatibility
+This software is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) license.
 # Compatibility
 | Blender Version | Addon Version | Long Term Support |
-|--------------------------------------------------------------|--------------------------------------------------------------------------------|-------------------|
+|-|-|-|
-| 4.0+                                                         | [latest](https://github.com/DarklightGames/io_scene_psk_psa/releases/latest)   | TBD               |
+| [4.1](https://www.blender.org/download/releases/4-1/) | [latest](https://github.com/DarklightGames/io_scene_psk_psa/releases/latest)   | TBD |
-| [3.4 - 3.6](https://www.blender.org/download/lts/3-6/)       | [5.0.5](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/5.0.5) | ✅️ June 2025      |
+| [4.0](https://www.blender.org/download/releases/4-0/) | [6.2.1](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/6.2.1) | TBD |
 | [3.4 - 3.6](https://www.blender.org/download/lts/3-6/) | [5.0.6](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/5.0.6) | ✅️ June 2025 |
 | [2.93 - 3.3](https://www.blender.org/download/releases/3-3/) | [4.3.0](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/4.3.0) | ✅️ September 2024 |
-Bug fixes will be issued for legacy addon versions that are under [Blender's LTS maintenance period](https://www.blender.org/download/lts/). Once the LTS period has ended, legacy addon-on versions will no longer be supported by the maintainers of this repository, although we will accept pull requests for bug fixes. 
+Bug fixes will be issued for legacy addon versions that are under [Blender's LTS maintenance period](https://www.blender.org/download/lts/). Once the LTS period has ended, legacy addon versions will no longer be supported by the maintainers of this repository, although we will accept pull requests for bug fixes. 
 # Features
 * Full PSK/PSA import and export capabilities.
@@ -57,6 +60,12 @@ Bug fixes will be issued for legacy addon versions that are under [Blender's LTS
 > Note that in order to see the imported actions applied to your armature, you must use the [Dope Sheet](https://docs.blender.org/manual/en/latest/editors/dope_sheet/introduction.html) or [Nonlinear Animation](https://docs.blender.org/manual/en/latest/editors/nla/introduction.html) editors.
 # FAQ
 ## Why can't I see the animations imported from my PSA?
 Simply importing an animation into the scene will not automatically apply the action to the armature. This is in part because a PSA can have multiple sequences imported from it, and also that it's generally bad form for importers to modify the scene when they don't need to.
 The PSA importer creates [Actions](https://docs.blender.org/manual/en/latest/animation/actions.html) for each of the selected sequences in the PSA. These actions can be applied to your armature via the [Action Editor](https://docs.blender.org/manual/en/latest/editors/dope_sheet/action.html) or [NLA Editor](https://docs.blender.org/manual/en/latest/editors/nla/index.html).
 ## Why are the mesh normals not accurate when importing a PSK extracted from [UE Viewer](https://www.gildor.org/en/projects/umodel)?
 If preserving the mesh normals of models is important for your workflow, it is *not recommended* to export PSK files from UE Viewer. This is because UE Viewer makes no attempt to reconstruct the original [smoothing groups](https://en.wikipedia.org/wiki/Smoothing_group). As a result, the normals of imported PSK files will be incorrect when imported into Blender and will need to be manually fixed.
--- a/build.py
+++ b/build.py
@@ -1,41 +0,0 @@
 import os
 import subprocess
 from fnmatch import fnmatch
 from zipfile import ZipFile, ZIP_DEFLATED
 ignore_patterns = [
    '*/__pycache__/*',
    '*/.git/*',
    '*/.github/*',
    '*/.idea/*',
    '*/venv/*',
    '*/.gitignore',
    '*/.gitattributes',
    '*/build/*',
    '*/build.py',
 ]
 def zipdir(path, zip_file: ZipFile):
    for root, dirs, files in os.walk(path):
        for file in files:
            if file != zip_file.filename and not any(fnmatch(os.path.join(root, file), pattern) for pattern in ignore_patterns):
                zip_file.write(os.path.join(root, file))
 # Get the branch name.
 branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).decode('utf-8').strip()
 # Get the most recent tag.
 tag = subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0']).decode('utf-8').strip()
 # Create a zip file of the current directory.
 zip_path = f'./build/io_scene_psk_psa-{branch}-{tag}.zip'
 # Check that the directory exists, if it doesn't, create it.
 if not os.path.exists('./build'):
    os.makedirs('./build')
 zipf = ZipFile(zip_path, 'w', ZIP_DEFLATED)
 zipdir('.', zipf)
 zipf.close()
--- a/io_scene_psk_psa/init.py
+++ b/io_scene_psk_psa/init.py
@@ -1,38 +1,30 @@
 from bpy.app.handlers import persistent
 bl_info = {
    "name": "PSK/PSA Importer/Exporter",
    "author": "Colin Basnett, Yurii Ti",
    "version": (6, 0, 0),
    "blender": (4, 0, 0),
    "description": "PSK/PSA Import/Export (.psk/.psa)",
    "warning": "",
    "doc_url": "https://github.com/DarklightGames/io_scene_psk_psa",
    "tracker_url": "https://github.com/DarklightGames/io_scene_psk_psa/issues",
    "category": "Import-Export"
 }
 if 'bpy' in locals():
    import importlib
-    importlib.reload(psx_data)
+    importlib.reload(shared_data)
-    importlib.reload(psx_helpers)
+    importlib.reload(shared_helpers)
-    importlib.reload(psx_types)
+    importlib.reload(shared_types)
    importlib.reload(psk_data)
    importlib.reload(psk_reader)
    importlib.reload(psk_writer)
    importlib.reload(psk_builder)
    importlib.reload(psk_importer)
    importlib.reload(psk_properties)
    importlib.reload(psk_ui)
    importlib.reload(psk_export_properties)
    importlib.reload(psk_export_operators)
    importlib.reload(psk_export_ui)
    importlib.reload(psk_import_operators)
    importlib.reload(psa_data)
    importlib.reload(psa_config)
    importlib.reload(psa_reader)
    importlib.reload(psa_writer)
    importlib.reload(psa_builder)
    importlib.reload(psa_importer)
    importlib.reload(psa_export_properties)
    importlib.reload(psa_export_operators)
    importlib.reload(psa_export_ui)
@@ -40,36 +32,32 @@ if 'bpy' in locals():
    importlib.reload(psa_import_operators)
    importlib.reload(psa_import_ui)
 else:
-    # if i remove this line, it can be enabled just fine
+    from .shared import data as shared_data, types as shared_types, helpers as shared_helpers
-    from . import data as psx_data
+    from .psk import data as psk_data, builder as psk_builder, writer as psk_writer, \
-    from . import helpers as psx_helpers
+    importer as psk_importer, properties as psk_properties
-    from . import types as psx_types
+    from .psk import reader as psk_reader, ui as psk_ui
-    from .psk import data as psk_data
+    from .psk.export import properties as psk_export_properties, ui as psk_export_ui, \
-    from .psk import reader as psk_reader
+        operators as psk_export_operators
    from .psk import writer as psk_writer
    from .psk import builder as psk_builder
    from .psk import importer as psk_importer
    from .psk.export import properties as psk_export_properties
    from .psk.export import operators as psk_export_operators
    from .psk.export import ui as psk_export_ui
    from .psk.import_ import operators as psk_import_operators
-    from .psa import data as psa_data
+    from .psa import config as psa_config, data as psa_data, writer as psa_writer, reader as psa_reader, \
-    from .psa import reader as psa_reader
+        builder as psa_builder, importer as psa_importer
-    from .psa import writer as psa_writer
+    from .psa.export import properties as psa_export_properties, ui as psa_export_ui, \
-    from .psa import builder as psa_builder
+        operators as psa_export_operators
    from .psa import importer as psa_importer
    from .psa.export import properties as psa_export_properties
    from .psa.export import operators as psa_export_operators
    from .psa.export import ui as psa_export_ui
    from .psa.import_ import properties as psa_import_properties
    from .psa.import_ import operators as psa_import_operators
-    from .psa.import_ import ui as psa_import_ui
+    from .psa.import_ import ui as psa_import_ui, properties as psa_import_properties
 import bpy
 from bpy.props import PointerProperty
-classes = psx_types.classes +\
+# TODO: just here so that it's not unreferenced and removed on save.
 if [shared_data, shared_helpers, psk_data, psk_reader, psk_writer, psk_builder, psk_importer, psa_data, psa_config,
    psa_reader, psa_writer, psa_builder, psa_importer]:
    pass
 classes = shared_types.classes +\
          psk_properties.classes +\
          psk_ui.classes +\
          psk_import_operators.classes +\
          psk_export_properties.classes +\
          psk_export_operators.classes +\
@@ -105,13 +93,15 @@ def register():
    bpy.types.TOPBAR_MT_file_import.append(psk_import_menu_func)
    bpy.types.TOPBAR_MT_file_export.append(psa_export_menu_func)
    bpy.types.TOPBAR_MT_file_import.append(psa_import_menu_func)
    bpy.types.Material.psk = PointerProperty(type=psk_properties.PSX_PG_material)
    bpy.types.Scene.psa_import = PointerProperty(type=psa_import_properties.PSA_PG_import)
    bpy.types.Scene.psa_export = PointerProperty(type=psa_export_properties.PSA_PG_export)
    bpy.types.Scene.psk_export = PointerProperty(type=psk_export_properties.PSK_PG_export)
-    bpy.types.Action.psa_export = PointerProperty(type=psx_types.PSX_PG_action_export)
+    bpy.types.Action.psa_export = PointerProperty(type=shared_types.PSX_PG_action_export)
 def unregister():
    del bpy.types.Material.psk
    del bpy.types.Scene.psa_import
    del bpy.types.Scene.psa_export
    del bpy.types.Scene.psk_export
--- a/io_scene_psk_psa/blender_manifest.toml
+++ b/io_scene_psk_psa/blender_manifest.toml
@@ -0,0 +1,24 @@
 schema_version = "1.0.0"
 id = "io_scene_psk_psa"
 version = "7.1.0"
 name = "Unreal Mesh & Animation (.psk/.psa)"
 tagline = "Import and export PSK and PSA files used in Unreal Engine"
 maintainer = "Colin Basnett <cmbasnett@gmail.com>"
 type = "add-on"
 website = "https://github.com/DarklightGames/io_scene_psk_psa/"
 tags = ["Game Engine", "Import-Export"]
 blender_version_min = "4.2.0"
 # Optional: maximum supported Blender version
 # blender_version_max = "5.1.0"
 license = [
  "SPDX:GPL-3.0-or-later",
 ]
 [build]
 paths_exclude_pattern = [
  "/.git/",
  "__pycache__/",
  "/venv/",
  "/.github/",
  ".gitignore",
 ]
--- a/io_scene_psk_psa/psa/builder.py
+++ b/io_scene_psk_psa/psa/builder.py
@@ -3,7 +3,7 @@ from typing import Optional
 from bpy.types import Armature, Bone, Action, PoseBone
 from .data import *
-from ..helpers import *
+from ..shared.helpers import *
 class PsaBuildSequence:
--- a/io_scene_psk_psa/psa/config.py
+++ b/io_scene_psk_psa/psa/config.py
@@ -0,0 +1,78 @@
 import re
 from configparser import ConfigParser
 from typing import Dict
 from .reader import PsaReader
 REMOVE_TRACK_LOCATION = (1 << 0)
 REMOVE_TRACK_ROTATION = (1 << 1)
 class PsaConfig:
    def __init__(self):
        self.sequence_bone_flags: Dict[str, Dict[int, int]] = dict()
 def _load_config_file(file_path: str) -> ConfigParser:
    """
    UEViewer exports a dialect of INI files that is not compatible with Python's ConfigParser.
    Specifically, it allows values in this format:
    [Section]
    Key1
    Key2
    This is not allowed in Python's ConfigParser, which requires a '=' character after each key name.
    To work around this, we'll modify the file to add the '=' character after each key name if it is missing.
    """
    with open(file_path, 'r') as f:
        lines = f.read().split('\n')
    lines = [re.sub(r'^\s*(\w+)\s*$', r'\1=', line) for line in lines]
    contents = '\n'.join(lines)
    config = ConfigParser()
    config.read_string(contents)
    return config
 def _get_bone_flags_from_value(value: str) -> int:
    match value:
        case 'all':
            return REMOVE_TRACK_LOCATION | REMOVE_TRACK_ROTATION
        case 'trans':
            return REMOVE_TRACK_LOCATION
        case 'rot':
            return REMOVE_TRACK_ROTATION
        case _:
            return 0
 def read_psa_config(psa_reader: PsaReader, file_path: str) -> PsaConfig:
    psa_config = PsaConfig()
    config = _load_config_file(file_path)
    if config.has_section('RemoveTracks'):
        for key, value in config.items('RemoveTracks'):
            match = re.match(f'^(.+)\.(\d+)$', key)
            sequence_name = match.group(1)
            # Map the sequence name onto the actual sequence name in the PSA file.
            try:
                psa_sequence_names = list(psa_reader.sequences.keys())
                lowercase_sequence_names = [sequence_name.lower() for sequence_name in psa_sequence_names]
                sequence_name = psa_sequence_names[lowercase_sequence_names.index(sequence_name.lower())]
            except ValueError:
                # Sequence name is not in the PSA file.
                continue
            if sequence_name not in psa_config.sequence_bone_flags:
                psa_config.sequence_bone_flags[sequence_name] = dict()
            bone_index = int(match.group(2))
            psa_config.sequence_bone_flags[sequence_name][bone_index] = _get_bone_flags_from_value(value)
    return psa_config
--- a/io_scene_psk_psa/psa/data.py
+++ b/io_scene_psk_psa/psa/data.py
@@ -2,12 +2,12 @@ import typing
 from collections import OrderedDict
 from typing import List
-from ..data import *
+from ..shared.data import *
-"""
+'''
 Note that keys are not stored within the Psa object.
 Use the PsaReader::get_sequence_keys to get the keys for a sequence.
-"""
+'''
 class Psa:
--- a/io_scene_psk_psa/psa/export/operators.py
+++ b/io_scene_psk_psa/psa/export/operators.py
@@ -11,7 +11,7 @@ from bpy_types import Operator
 from .properties import PSA_PG_export, PSA_PG_export_action_list_item, filter_sequences
 from ..builder import build_psa, PsaBuildSequence, PsaBuildOptions
 from ..writer import write_psa
-from ...helpers import populate_bone_collection_list, get_nla_strips_in_frame_range
+from ...shared.helpers import populate_bone_collection_list, get_nla_strips_in_frame_range
 def is_action_for_armature(armature: Armature, action: Action):
@@ -47,7 +47,7 @@ def update_actions_and_timeline_markers(context: Context, armature: Armature):
        if not is_action_for_armature(armature, action):
            continue
-        if not action.name.startswith('#'):
+        if action.name != '' and not action.name.startswith('#'):
            for (name, frame_start, frame_end) in get_sequences_from_action(action):
                item = pg.action_list.add()
                item.action = action
@@ -60,9 +60,9 @@ def update_actions_and_timeline_markers(context: Context, armature: Armature):
        # Pose markers are not guaranteed to be in frame-order, so make sure that they are.
        pose_markers = sorted(action.pose_markers, key=lambda x: x.frame)
        for pose_marker_index, pose_marker in enumerate(pose_markers):
-            if pose_marker.name.startswith('#'):
+            if pose_marker.name.strip() == '' or pose_marker.name.startswith('#'):
                continue
-            for (name, frame_start, frame_end) in get_sequences_from_action_pose_marker(action, pose_markers, pose_marker, pose_marker_index):
+            for (name, frame_start, frame_end) in get_sequences_from_action_pose_markers(action, pose_markers, pose_marker, pose_marker_index):
                item = pg.action_list.add()
                item.action = action
                item.name = name
@@ -78,7 +78,7 @@ def update_actions_and_timeline_markers(context: Context, armature: Armature):
    for marker_name in marker_names:
        if marker_name not in sequence_frame_ranges:
            continue
-        if marker_name.startswith('#'):
+        if marker_name.strip() == '' or marker_name.startswith('#'):
            continue
        frame_start, frame_end = sequence_frame_ranges[marker_name]
        sequences = get_sequences_from_name_and_frame_range(marker_name, frame_start, frame_end)
@@ -91,14 +91,15 @@ def update_actions_and_timeline_markers(context: Context, armature: Armature):
 def get_sequence_fps(context: Context, fps_source: str, fps_custom: float, actions: Iterable[Action]) -> float:
-    if fps_source == 'SCENE':
+    match fps_source:
        case 'SCENE':
            return context.scene.render.fps
-    elif fps_source == 'CUSTOM':
+        case 'CUSTOM':
            return fps_custom
-    elif fps_source == 'ACTION_METADATA':
+        case 'ACTION_METADATA':
            # Get the minimum value of action metadata FPS values.
            return min([action.psa_export.fps for action in actions])
-    else:
+        case _:
            raise RuntimeError(f'Invalid FPS source "{fps_source}"')
@@ -110,7 +111,7 @@ def get_animation_data_object(context: Context) -> Object:
    if active_object.type != 'ARMATURE':
        raise RuntimeError('Selected object must be an Armature')
-    if pg.should_override_animation_data:
+    if pg.sequence_source != 'ACTIONS' and pg.should_override_animation_data:
        animation_data_object = pg.animation_data_override
    else:
        animation_data_object = active_object
@@ -187,13 +188,18 @@ def get_sequences_from_action(action: Action) -> List[Tuple[str, int, int]]:
    return get_sequences_from_name_and_frame_range(action.name, frame_start, frame_end)
-def get_sequences_from_action_pose_marker(action: Action, pose_markers: List[TimelineMarker], pose_marker: TimelineMarker, pose_marker_index: int) -> List[Tuple[str, int, int]]:
+def get_sequences_from_action_pose_markers(action: Action, pose_markers: List[TimelineMarker], pose_marker: TimelineMarker, pose_marker_index: int) -> List[Tuple[str, int, int]]:
    frame_start = pose_marker.frame
-    if pose_marker_index + 1 < len(pose_markers):
+    sequence_name = pose_marker.name
    if pose_marker.name.startswith('!'):
        # If the pose marker name starts with an exclamation mark, only export the first frame.
        frame_end = frame_start
        sequence_name = sequence_name[1:]
    elif pose_marker_index + 1 < len(pose_markers):
        frame_end = pose_markers[pose_marker_index + 1].frame
    else:
        frame_end = int(action.frame_range[1])
-    return get_sequences_from_name_and_frame_range(pose_marker.name, frame_start, frame_end)
+    return get_sequences_from_name_and_frame_range(sequence_name, frame_start, frame_end)
 def get_visible_sequences(pg: PSA_PG_export, sequences) -> List[PSA_PG_export_action_list_item]:
@@ -390,6 +396,8 @@ class PSA_OT_export(Operator, ExportHelper):
                export_sequence.nla_state.frame_start = nla_strip_item.frame_start
                export_sequence.nla_state.frame_end = nla_strip_item.frame_end
                export_sequence.fps = get_sequence_fps(context, pg.fps_source, pg.fps_custom, [nla_strip_item.action])
                export_sequence.compression_ratio = nla_strip_item.action.psa_export.compression_ratio
                export_sequence.key_quota = nla_strip_item.action.psa_export.key_quota
                export_sequences.append(export_sequence)
        else:
            raise ValueError(f'Unhandled sequence source: {pg.sequence_source}')
--- a/io_scene_psk_psa/psa/export/properties.py
+++ b/io_scene_psk_psa/psa/export/properties.py
@@ -7,7 +7,7 @@ from bpy.props import BoolProperty, PointerProperty, EnumProperty, FloatProperty
    StringProperty
 from bpy.types import PropertyGroup, Object, Action, AnimData, Context
-from ...types import PSX_PG_bone_collection_list_item
+from ...shared.types import PSX_PG_bone_collection_list_item
 def psa_export_property_group_animation_data_override_poll(_context, obj):
@@ -44,12 +44,13 @@ class PSA_PG_export_nla_strip_list_item(PropertyGroup):
 def nla_track_update_cb(self: 'PSA_PG_export', context: Context) -> None:
    self.nla_strip_list.clear()
    if context.object is None or context.object.animation_data is None:
        return
    match = re.match(r'^(\d+).+$', self.nla_track)
    self.nla_track_index = int(match.group(1)) if match else -1
    if self.nla_track_index >= 0:
-        nla_track = context.object.animation_data.nla_tracks[self.nla_track_index]
+        animation_data = get_animation_data(self, context)
        if animation_data is None:
            return
        nla_track = animation_data.nla_tracks[self.nla_track_index]
        for nla_strip in nla_track.strips:
            strip: PSA_PG_export_nla_strip_list_item = self.nla_strip_list.add()
            strip.action = nla_strip.action
@@ -152,7 +153,7 @@ class PSA_PG_export(PropertyGroup):
        default=False,
        name='Enforce Bone Name Restrictions',
        description='Bone names restrictions will be enforced. Note that bone names without properly formatted names '
-                    'cannot be referenced in scripts'
+                    'may not be able to be referenced in-engine'
    )
    sequence_name_prefix: StringProperty(name='Prefix', options=empty_set)
    sequence_name_suffix: StringProperty(name='Suffix', options=empty_set)
--- a/io_scene_psk_psa/psa/export/ui.py
+++ b/io_scene_psk_psa/psa/export/ui.py
@@ -30,21 +30,19 @@ class PSA_UL_export_sequences(UIList):
        pg = getattr(context.scene, 'psa_export')
        row = layout.row()
        subrow = row.row(align=True)
-        subrow.prop(pg, 'sequence_filter_name', text="")
+        subrow.prop(pg, 'sequence_filter_name', text='')
-        subrow.prop(pg, 'sequence_use_filter_invert', text="", icon='ARROW_LEFTRIGHT')
+        subrow.prop(pg, 'sequence_use_filter_invert', text='', icon='ARROW_LEFTRIGHT')
        # subrow.prop(pg, 'sequence_use_filter_sort_reverse', text='', icon='SORT_ASC')
        if pg.sequence_source == 'ACTIONS':
            subrow = row.row(align=True)
            subrow.prop(pg, 'sequence_filter_asset', icon_only=True, icon='ASSET_MANAGER')
            subrow.prop(pg, 'sequence_filter_pose_marker', icon_only=True, icon='PMARKER')
-            subrow.prop(pg, 'sequence_filter_reversed', text="", icon='FRAME_PREV')
+            subrow.prop(pg, 'sequence_filter_reversed', text='', icon='FRAME_PREV')
    def filter_items(self, context, data, prop):
        pg = getattr(context.scene, 'psa_export')
        actions = getattr(data, prop)
        flt_flags = filter_sequences(pg, actions)
        # flt_neworder = bpy.types.UI_UL_list.sort_items_by_name(actions, 'name')
        flt_neworder = list(range(len(actions)))
        return flt_flags, flt_neworder
--- a/io_scene_psk_psa/psa/import_/operators.py
+++ b/io_scene_psk_psa/psa/import_/operators.py
@@ -1,10 +1,12 @@
 import os
 from pathlib import Path
 from bpy.props import StringProperty
-from bpy.types import Operator, Event, Context
+from bpy.types import Operator, Event, Context, FileHandler
 from bpy_extras.io_utils import ImportHelper
 from .properties import get_visible_sequences
 from ..config import read_psa_config
 from ..importer import import_psa, PsaImportOptions
 from ..reader import PsaReader
@@ -87,23 +89,6 @@ class PSA_OT_import_sequences_deselect_all(Operator):
        return {'FINISHED'}
 class PSA_OT_import_select_file(Operator):
    bl_idname = 'psa_import.select_file'
    bl_label = 'Select'
    bl_options = {'INTERNAL'}
    bl_description = 'Select a PSA file from which to import animations'
    filepath: StringProperty(subtype='FILE_PATH')
    filter_glob: StringProperty(default="*.psa", options={'HIDDEN'})
    def execute(self, context):
        getattr(context.scene, 'psa_import').psa_file_path = self.filepath
        return {"FINISHED"}
    def invoke(self, context, event):
        context.window_manager.fileselect_add(self)
        return {"RUNNING_MODAL"}
 def load_psa_file(context, filepath: str):
    pg = context.scene.psa_import
    pg.sequence_list.clear()
@@ -156,6 +141,10 @@ class PSA_OT_import(Operator, ImportHelper):
        psa_reader = PsaReader(self.filepath)
        sequence_names = [x.action_name for x in pg.sequence_list if x.is_selected]
        if len(sequence_names) == 0:
            self.report({'ERROR_INVALID_CONTEXT'}, 'No sequences selected')
            return {'CANCELLED'}
        options = PsaImportOptions()
        options.sequence_names = sequence_names
        options.should_use_fake_user = pg.should_use_fake_user
@@ -169,9 +158,14 @@ class PSA_OT_import(Operator, ImportHelper):
        options.fps_source = pg.fps_source
        options.fps_custom = pg.fps_custom
-        if len(sequence_names) == 0:
+        if options.should_use_config_file:
-            self.report({'ERROR_INVALID_CONTEXT'}, 'No sequences selected')
+            # Read the PSA config file if it exists.
-            return {'CANCELLED'}
+            config_path = Path(self.filepath).with_suffix('.config')
            if config_path.exists():
                try:
                    options.psa_config = read_psa_config(psa_reader, str(config_path))
                except Exception as e:
                    self.report({'WARNING'}, f'Failed to read PSA config file: {e}')
        result = import_psa(context, psa_reader, context.view_layer.objects.active, options)
@@ -196,18 +190,18 @@ class PSA_OT_import(Operator, ImportHelper):
        layout = self.layout
        pg = getattr(context.scene, 'psa_import')
        sequences_header, sequences_panel = layout.panel('sequences_panel_id', default_closed=False)
        sequences_header.label(text='Sequences')
        if sequences_panel:
            if pg.psa_error:
-            row = layout.row()
+                row = sequences_panel.row()
                row.label(text='Select a PSA file', icon='ERROR')
            else:
            box = layout.box()
            box.label(text=f'Sequences ({len(pg.sequence_list)})', icon='ARMATURE_DATA')
                # Select buttons.
                rows = max(3, min(len(pg.sequence_list), 10))
-            row = box.row()
+                row = sequences_panel.row()
                col = row.column()
                row2 = col.row(align=True)
@@ -219,42 +213,59 @@ class PSA_OT_import(Operator, ImportHelper):
                col = col.row()
                col.template_list('PSA_UL_import_sequences', '', pg, 'sequence_list', pg, 'sequence_list_index', rows=rows)
-        col = layout.column(heading='')
+            col = sequences_panel.column(heading='')
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(pg, 'fps_source')
            if pg.fps_source == 'CUSTOM':
                col.prop(pg, 'fps_custom')
            col.prop(pg, 'should_overwrite')
            col.prop(pg, 'should_use_action_name_prefix')
            if pg.should_use_action_name_prefix:
                col.prop(pg, 'action_name_prefix')
-        col = layout.column(heading='Write')
+        data_header, data_panel = layout.panel('data_panel_id', default_closed=False)
        data_header.label(text='Data')
        if data_panel:
            col = data_panel.column(heading='Write')
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(pg, 'should_write_keyframes')
            col.prop(pg, 'should_write_metadata')
-        col = layout.column()
+            if pg.should_write_keyframes:
                col = col.column(heading='Keyframes')
                col.use_property_split = True
                col.use_property_decorate = False
                col.prop(pg, 'should_convert_to_samples')
        advanced_header, advanced_panel = layout.panel('advanced_panel_id', default_closed=True)
        advanced_header.label(text='Advanced')
        if advanced_panel:
            col = advanced_panel.column()
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(pg, 'bone_mapping_mode')
-        if pg.should_write_keyframes:
+            col = advanced_panel.column(heading='Options')
            col = layout.column(heading='Keyframes')
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(pg, 'should_convert_to_samples')
            col.separator()
            # FPS
            col.prop(pg, 'fps_source')
            if pg.fps_source == 'CUSTOM':
                col.prop(pg, 'fps_custom')
        col = layout.column(heading='Options')
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(pg, 'should_use_fake_user')
            col.prop(pg, 'should_stash')
-        col.prop(pg, 'should_use_action_name_prefix')
+            col.prop(pg, 'should_use_config_file')
-        if pg.should_use_action_name_prefix:
+
-            col.prop(pg, 'action_name_prefix')
+class PSA_FH_import(FileHandler):
    bl_idname = 'PSA_FH_import'
    bl_label = 'File handler for Unreal PSA import'
    bl_import_operator = 'psa_import.import'
    bl_file_extensions = '.psa'
    @classmethod
    def poll_drop(cls, context: Context):
        return context.area and context.area.type == 'VIEW_3D'
 classes = (
@@ -262,5 +273,5 @@ classes = (
    PSA_OT_import_sequences_deselect_all,
    PSA_OT_import_sequences_from_text,
    PSA_OT_import,
-    PSA_OT_import_select_file,
+    PSA_FH_import,
 )
--- a/io_scene_psk_psa/psa/import_/properties.py
+++ b/io_scene_psk_psa/psa/import_/properties.py
@@ -32,6 +32,12 @@ class PSA_PG_import(PropertyGroup):
                                       description='Assign each imported action a fake user so that the data block is '
                                                   'saved even it has no users',
                                       options=empty_set)
    should_use_config_file: BoolProperty(default=True, name='Use Config File',
                                            description='Use the .config file that is sometimes generated when the PSA '
                                                        'file is exported from UEViewer. This file contains '
                                                        'options that can be used to filter out certain bones tracks '
                                                        'from the imported actions',
                                            options=empty_set)
    should_stash: BoolProperty(default=False, name='Stash',
                               description='Stash each imported action as a strip on a new non-contributing NLA track',
                               options=empty_set)
@@ -65,23 +71,38 @@ class PSA_PG_import(PropertyGroup):
            ('EXACT', 'Exact', 'Bone names must match exactly.', 'EXACT', 0),
            ('CASE_INSENSITIVE', 'Case Insensitive', 'Bones names must match, ignoring case (e.g., the bone PSA bone '
             '\'root\' can be mapped to the armature bone \'Root\')', 'CASE_INSENSITIVE', 1),
-        )
+        ),
        default='CASE_INSENSITIVE'
    )
    fps_source: EnumProperty(name='FPS Source', items=(
        ('SEQUENCE', 'Sequence', 'The sequence frame rate matches the original frame rate', 'ACTION', 0),
-        ('SCENE', 'Scene', 'The sequence frame rate dilates to match that of the scene', 'SCENE_DATA', 1),
+        ('SCENE', 'Scene', 'The sequence is resampled to the frame rate of the scene', 'SCENE_DATA', 1),
-        ('CUSTOM', 'Custom', 'The sequence frame rate dilates to match a custom frame rate', 2),
+        ('CUSTOM', 'Custom', 'The sequence is resampled to a custom frame rate', 2),
    ))
    fps_custom: FloatProperty(
        default=30.0,
        name='Custom FPS',
-        description='The frame rate to which the imported actions will be converted',
+        description='The frame rate to which the imported sequences will be resampled to',
        options=empty_set,
        min=1.0,
        soft_min=1.0,
        soft_max=60.0,
        step=100,
    )
    compression_ratio_source: EnumProperty(name='Compression Ratio Source', items=(
        ('ACTION', 'Action', 'The compression ratio is sourced from the action metadata', 'ACTION', 0),
        ('CUSTOM', 'Custom', 'The compression ratio is set to a custom value', 1),
    ))
    compression_ratio_custom: FloatProperty(
        default=1.0,
        name='Custom Compression Ratio',
        description='The compression ratio to apply to the imported sequences',
        options=empty_set,
        min=0.0,
        soft_min=0.0,
        soft_max=1.0,
        step=0.0625,
    )
 def filter_sequences(pg: PSA_PG_import, sequences) -> List[int]:
--- a/io_scene_psk_psa/psa/import_/ui.py
+++ b/io_scene_psk_psa/psa/import_/ui.py
@@ -4,7 +4,7 @@ from bpy.types import UIList
 from .properties import filter_sequences
-class PSA_UL_sequences(UIList):
+class PSA_UL_sequences_mixin(UIList):
    def draw_item(self, context, layout, data, item, icon, active_data, active_property, index, flt_flag):
        row = layout.row(align=True)
        split = row.split(align=True, factor=0.75)
@@ -17,10 +17,10 @@ class PSA_UL_sequences(UIList):
        pg = getattr(context.scene, 'psa_import')
        row = layout.row()
        sub_row = row.row(align=True)
-        sub_row.prop(pg, 'sequence_filter_name', text="")
+        sub_row.prop(pg, 'sequence_filter_name', text='')
-        sub_row.prop(pg, 'sequence_use_filter_invert', text="", icon='ARROW_LEFTRIGHT')
+        sub_row.prop(pg, 'sequence_use_filter_invert', text='', icon='ARROW_LEFTRIGHT')
-        sub_row.prop(pg, 'sequence_use_filter_regex', text="", icon='SORTBYEXT')
+        sub_row.prop(pg, 'sequence_use_filter_regex', text='', icon='SORTBYEXT')
-        sub_row.prop(pg, 'sequence_filter_is_selected', text="", icon='CHECKBOX_HLT')
+        sub_row.prop(pg, 'sequence_filter_is_selected', text='', icon='CHECKBOX_HLT')
    def filter_items(self, context, data, property_):
        pg = getattr(context.scene, 'psa_import')
@@ -30,11 +30,15 @@ class PSA_UL_sequences(UIList):
        return flt_flags, flt_neworder
-class PSA_UL_import_sequences(PSA_UL_sequences, UIList):
+class PSA_UL_sequences(PSA_UL_sequences_mixin):
    pass
-class PSA_UL_import_actions(PSA_UL_sequences, UIList):
+class PSA_UL_import_sequences(PSA_UL_sequences_mixin):
    pass
 class PSA_UL_import_actions(PSA_UL_sequences_mixin):
    pass
--- a/io_scene_psk_psa/psa/importer.py
+++ b/io_scene_psk_psa/psa/importer.py
@@ -2,10 +2,11 @@ import typing
 from typing import List, Optional
 import bpy
-import numpy
+import numpy as np
 from bpy.types import FCurve, Object, Context
 from mathutils import Vector, Quaternion
 from .config import PsaConfig, REMOVE_TRACK_LOCATION, REMOVE_TRACK_ROTATION
 from .data import Psa
 from .reader import PsaReader
@@ -23,6 +24,8 @@ class PsaImportOptions(object):
        self.bone_mapping_mode = 'CASE_INSENSITIVE'
        self.fps_source = 'SEQUENCE'
        self.fps_custom: float = 30.0
        self.should_use_config_file = True
        self.psa_config: PsaConfig = PsaConfig()
 class ImportBone(object):
@@ -43,16 +46,16 @@ def _calculate_fcurve_data(import_bone: ImportBone, key_data: typing.Iterable[fl
    key_location = Vector(key_data[4:])
    q = import_bone.post_rotation.copy()
    q.rotate(import_bone.original_rotation)
-    quat = q
+    rotation = q
    q = import_bone.post_rotation.copy()
    if import_bone.parent is None:
        q.rotate(key_rotation.conjugated())
    else:
        q.rotate(key_rotation)
-    quat.rotate(q.conjugated())
+    rotation.rotate(q.conjugated())
-    loc = key_location - import_bone.original_location
+    location = key_location - import_bone.original_location
-    loc.rotate(import_bone.post_rotation.conjugated())
+    location.rotate(import_bone.post_rotation.conjugated())
-    return quat.w, quat.x, quat.y, quat.z, loc.x, loc.y, loc.z
+    return rotation.w, rotation.x, rotation.y, rotation.z, location.x, location.y, location.z
 class PsaImportResult:
@@ -76,6 +79,51 @@ def _get_armature_bone_index_for_psa_bone(psa_bone_name: str, armature_bone_name
                return armature_bone_index
    return None
 def _get_sample_frame_times(source_frame_count: int, frame_step: float) -> typing.Iterable[float]:
    # TODO: for correctness, we should also emit the target frame time as well (because the last frame can be a
    #  fractional frame).
    time = 0.0
    while time < source_frame_count - 1:
        yield time
        time += frame_step
    yield source_frame_count - 1
 def _resample_sequence_data_matrix(sequence_data_matrix: np.ndarray, frame_step: float = 1.0) -> np.ndarray:
    """
    Resamples the sequence data matrix to the target frame count.
    @param sequence_data_matrix: FxBx7 matrix where F is the number of frames, B is the number of bones, and X is the
    number of data elements per bone.
    @param frame_step: The step between frames in the resampled sequence.
    @return: The resampled sequence data matrix, or sequence_data_matrix if no resampling is necessary.
    """
    if frame_step == 1.0:
        # No resampling is necessary.
        return sequence_data_matrix
    source_frame_count, bone_count = sequence_data_matrix.shape[:2]
    sample_frame_times = list(_get_sample_frame_times(source_frame_count, frame_step))
    target_frame_count = len(sample_frame_times)
    resampled_sequence_data_matrix = np.zeros((target_frame_count, bone_count, 7), dtype=float)
    for sample_frame_index, sample_frame_time in enumerate(sample_frame_times):
        frame_index = int(sample_frame_time)
        if sample_frame_time % 1.0 == 0.0:
            # Sample time has no fractional part, so just copy the frame.
            resampled_sequence_data_matrix[sample_frame_index, :, :] = sequence_data_matrix[frame_index, :, :]
        else:
            # Sample time has a fractional part, so interpolate between two frames.
            next_frame_index = frame_index + 1
            for bone_index in range(bone_count):
                source_frame_1_data = sequence_data_matrix[frame_index, bone_index, :]
                source_frame_2_data = sequence_data_matrix[next_frame_index, bone_index, :]
                factor = sample_frame_time - frame_index
                q = Quaternion((source_frame_1_data[:4])).slerp(Quaternion((source_frame_2_data[:4])), factor)
                q.normalize()
                l = Vector(source_frame_1_data[4:]).lerp(Vector(source_frame_2_data[4:]), factor)
                resampled_sequence_data_matrix[sample_frame_index, bone_index, :] = q.w, q.x, q.y, q.z, l.x, l.y, l.z
    return resampled_sequence_data_matrix
 def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object, options: PsaImportOptions) -> PsaImportResult:
    result = PsaImportResult()
@@ -95,7 +143,7 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
        if armature_bone_index is not None:
            # Ensure that no other PSA bone has been mapped to this armature bone yet.
            if armature_bone_index not in armature_to_psa_bone_indices:
-                psa_to_armature_bone_indices[psa_bone_index] = armature_bone_names.index(psa_bone_name)
+                psa_to_armature_bone_indices[psa_bone_index] = armature_bone_index
                armature_to_psa_bone_indices[armature_bone_index] = psa_bone_index
            else:
                # This armature bone has already been mapped to a PSA bone.
@@ -124,7 +172,7 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
    # Create intermediate bone data for import operations.
    import_bones = []
-    import_bones_dict = dict()
+    psa_bone_names_to_import_bones = dict()
    for (psa_bone_index, psa_bone), psa_bone_name in zip(enumerate(psa_reader.bones), psa_bone_names):
        if psa_bone_index not in psa_to_armature_bone_indices:
@@ -134,15 +182,22 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
        import_bone = ImportBone(psa_bone)
        import_bone.armature_bone = armature_data.bones[psa_bone_name]
        import_bone.pose_bone = armature_object.pose.bones[psa_bone_name]
-        import_bones_dict[psa_bone_name] = import_bone
+        psa_bone_names_to_import_bones[psa_bone_name] = import_bone
        import_bones.append(import_bone)
    bones_with_missing_parents = []
    for import_bone in filter(lambda x: x is not None, import_bones):
        armature_bone = import_bone.armature_bone
-        if armature_bone.parent is not None and armature_bone.parent.name in psa_bone_names:
+        has_parent = armature_bone.parent is not None
-            import_bone.parent = import_bones_dict[armature_bone.parent.name]
+        if has_parent:
            if armature_bone.parent.name in psa_bone_names:
                import_bone.parent = psa_bone_names_to_import_bones[armature_bone.parent.name]
            else:
                # Add a warning if the parent bone is not in the PSA.
                bones_with_missing_parents.append(armature_bone)
        # Calculate the original location & rotation of each bone (in world-space maybe?)
-        if import_bone.parent is not None:
+        if has_parent:
            import_bone.original_location = armature_bone.matrix_local.translation - armature_bone.parent.matrix_local.translation
            import_bone.original_location.rotate(armature_bone.parent.matrix_local.to_quaternion().conjugated())
            import_bone.original_rotation = armature_bone.matrix_local.to_quaternion()
@@ -150,9 +205,16 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
            import_bone.original_rotation.conjugate()
        else:
            import_bone.original_location = armature_bone.matrix_local.translation.copy()
-            import_bone.original_rotation = armature_bone.matrix_local.to_quaternion()
+            import_bone.original_rotation = armature_bone.matrix_local.to_quaternion().conjugated()
        import_bone.post_rotation = import_bone.original_rotation.conjugated()
    # Warn about bones with missing parents.
    if len(bones_with_missing_parents) > 0:
        count = len(bones_with_missing_parents)
        message = f'{count} bone(s) have parents that are not present in the PSA:\n' + str([x.name for x in bones_with_missing_parents])
        result.warnings.append(message)
    context.window_manager.progress_begin(0, len(sequences))
    # Create and populate the data for new sequences.
@@ -162,43 +224,48 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
        sequence_name = sequence.name.decode('windows-1252')
        action_name = options.action_name_prefix + sequence_name
        # Get the bone track flags for this sequence, or an empty dictionary if none exist.
        sequence_bone_track_flags = dict()
        if sequence_name in options.psa_config.sequence_bone_flags.keys():
            sequence_bone_track_flags = options.psa_config.sequence_bone_flags[sequence_name]
        if options.should_overwrite and action_name in bpy.data.actions:
            action = bpy.data.actions[action_name]
        else:
            action = bpy.data.actions.new(name=action_name)
        # Calculate the target FPS.
-        target_fps = sequence.fps
+        match options.fps_source:
-        if options.fps_source == 'CUSTOM':
+            case 'CUSTOM':
                target_fps = options.fps_custom
-        elif options.fps_source == 'SCENE':
+            case 'SCENE':
                target_fps = context.scene.render.fps
-        elif options.fps_source == 'SEQUENCE':
+            case 'SEQUENCE':
                target_fps = sequence.fps
-        else:
+            case _:
                raise ValueError(f'Unknown FPS source: {options.fps_source}')
        keyframe_time_dilation = target_fps / sequence.fps
        if options.should_write_keyframes:
-            # Remove existing f-curves (replace with action.fcurves.clear() in Blender 3.2)
+            # Remove existing f-curves.
-            while len(action.fcurves) > 0:
+            action.fcurves.clear()
                action.fcurves.remove(action.fcurves[-1])
            # Create f-curves for the rotation and location of each bone.
            for psa_bone_index, armature_bone_index in psa_to_armature_bone_indices.items():
                bone_track_flags = sequence_bone_track_flags.get(psa_bone_index, 0)
                import_bone = import_bones[psa_bone_index]
                pose_bone = import_bone.pose_bone
                rotation_data_path = pose_bone.path_from_id('rotation_quaternion')
                location_data_path = pose_bone.path_from_id('location')
                add_rotation_fcurves = (bone_track_flags & REMOVE_TRACK_ROTATION) == 0
                add_location_fcurves = (bone_track_flags & REMOVE_TRACK_LOCATION) == 0
                import_bone.fcurves = [
-                    action.fcurves.new(rotation_data_path, index=0, action_group=pose_bone.name),  # Qw
+                    action.fcurves.new(rotation_data_path, index=0, action_group=pose_bone.name) if add_rotation_fcurves else None,  # Qw
-                    action.fcurves.new(rotation_data_path, index=1, action_group=pose_bone.name),  # Qx
+                    action.fcurves.new(rotation_data_path, index=1, action_group=pose_bone.name) if add_rotation_fcurves else None,  # Qx
-                    action.fcurves.new(rotation_data_path, index=2, action_group=pose_bone.name),  # Qy
+                    action.fcurves.new(rotation_data_path, index=2, action_group=pose_bone.name) if add_rotation_fcurves else None,  # Qy
-                    action.fcurves.new(rotation_data_path, index=3, action_group=pose_bone.name),  # Qz
+                    action.fcurves.new(rotation_data_path, index=3, action_group=pose_bone.name) if add_rotation_fcurves else None,  # Qz
-                    action.fcurves.new(location_data_path, index=0, action_group=pose_bone.name),  # Lx
+                    action.fcurves.new(location_data_path, index=0, action_group=pose_bone.name) if add_location_fcurves else None,  # Lx
-                    action.fcurves.new(location_data_path, index=1, action_group=pose_bone.name),  # Ly
+                    action.fcurves.new(location_data_path, index=1, action_group=pose_bone.name) if add_location_fcurves else None,  # Ly
-                    action.fcurves.new(location_data_path, index=2, action_group=pose_bone.name),  # Lz
+                    action.fcurves.new(location_data_path, index=2, action_group=pose_bone.name) if add_location_fcurves else None,  # Lz
                ]
            # Read the sequence data matrix from the PSA.
@@ -214,15 +281,25 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
                    # Calculate the local-space key data for the bone.
                    sequence_data_matrix[frame_index, bone_index] = _calculate_fcurve_data(import_bone, key_data)
            # Resample the sequence data to the target FPS.
            # If the target frame count is the same as the source frame count, this will be a no-op.
            resampled_sequence_data_matrix = _resample_sequence_data_matrix(sequence_data_matrix,
                                                                            frame_step=sequence.fps / target_fps)
            # Write the keyframes out.
-            fcurve_data = numpy.zeros(2 * sequence.frame_count, dtype=float)
+            # Note that the f-curve data consists of alternating time and value data.
-            fcurve_data[0::2] = [x * keyframe_time_dilation for x in range(sequence.frame_count)]
+            target_frame_count = resampled_sequence_data_matrix.shape[0]
            fcurve_data = np.zeros(2 * target_frame_count, dtype=float)
            fcurve_data[0::2] = range(0, target_frame_count)
            for bone_index, import_bone in enumerate(import_bones):
                if import_bone is None:
                    continue
                for fcurve_index, fcurve in enumerate(import_bone.fcurves):
-                    fcurve_data[1::2] = sequence_data_matrix[:, bone_index, fcurve_index]
+                    if fcurve is None:
-                    fcurve.keyframe_points.add(sequence.frame_count)
+                        continue
                    fcurve_data[1::2] = resampled_sequence_data_matrix[:, bone_index, fcurve_index]
                    fcurve.keyframe_points.add(target_frame_count)
                    fcurve.keyframe_points.foreach_set('co', fcurve_data)
                    for fcurve_keyframe in fcurve.keyframe_points:
                        fcurve_keyframe.interpolation = 'LINEAR'
--- a/io_scene_psk_psa/psa/reader.py
+++ b/io_scene_psk_psa/psa/reader.py
@@ -11,8 +11,7 @@ def _try_fix_cue4parse_issue_103(sequences) -> bool:
    # The issue was that the frame_start_index was not being set correctly, and was always being set to the same value
    # as the frame_count.
    # This fix will eventually be deprecated as it is only necessary for files exported prior to the fix.
-    if len(sequences) > 0:
+    if len(sequences) > 0 and sequences[0].frame_start_index == sequences[0].frame_count:
        if sequences[0].frame_start_index == sequences[0].frame_count:
        # Manually set the frame_start_index for each sequence. This assumes that the sequences are in order with
        # no shared frames between sequences (all exporters that I know of do this, so it's a safe assumption).
        frame_start_index = 0
--- a/io_scene_psk_psa/psa/writer.py
+++ b/io_scene_psk_psa/psa/writer.py
@@ -2,7 +2,7 @@ from ctypes import Structure, sizeof
 from typing import Type
 from .data import Psa
-from ..data import Section
+from ..shared.data import Section
 def write_section(fp, name: bytes, data_type: Type[Structure] = None, data: list = None):
--- a/io_scene_psk_psa/psk/builder.py
+++ b/io_scene_psk_psa/psk/builder.py
@@ -1,15 +1,19 @@
 from typing import Optional
 import bmesh
 import bpy
-from bpy.types import Armature
+import numpy as np
 from bpy.types import Armature, Material
 from .data import *
-from ..helpers import *
+from .properties import triangle_type_and_bit_flags_to_poly_flags
 from ..shared.helpers import *
 class PskInputObjects(object):
    def __init__(self):
        self.mesh_objects = []
-        self.armature_object = None
+        self.armature_object: Optional[Object] = None
 class PskBuildOptions(object):
@@ -17,17 +21,15 @@ class PskBuildOptions(object):
        self.bone_filter_mode = 'ALL'
        self.bone_collection_indices: List[int] = []
        self.use_raw_mesh_data = True
-        self.material_names: List[str] = []
+        self.materials: List[Material] = []
        self.should_enforce_bone_name_restrictions = False
 def get_psk_input_objects(context) -> PskInputObjects:
    input_objects = PskInputObjects()
    for selected_object in context.view_layer.objects.selected:
-        if selected_object.type != 'MESH':
+        if selected_object.type == 'MESH':
-            raise RuntimeError(f'Selected object "{selected_object.name}" is not a mesh')
+            input_objects.mesh_objects.append(selected_object)
    input_objects.mesh_objects = context.view_layer.objects.selected
    if len(input_objects.mesh_objects) == 0:
        raise RuntimeError('At least one mesh must be selected')
@@ -61,7 +63,7 @@ def get_psk_input_objects(context) -> PskInputObjects:
 class PskBuildResult(object):
    def __init__(self):
        self.psk = None
-        self.warnings = []
+        self.warnings: List[str] = []
 def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
@@ -72,9 +74,9 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
    psk = Psk()
    bones = []
-    if armature_object is None:
+    if armature_object is None or len(armature_object.data.bones) == 0:
-        # If the mesh has no armature object, simply assign it a dummy bone at the root to satisfy the requirement
+        # If the mesh has no armature object or no bones, simply assign it a dummy bone at the root to satisfy the
-        # that a PSK file must have at least one bone.
+        # requirement that a PSK file must have at least one bone.
        psk_bone = Psk.Bone()
        psk_bone.name = bytes('root', encoding='windows-1252')
        psk_bone.flags = 0
@@ -135,18 +137,24 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
            psk.bones.append(psk_bone)
    # MATERIALS
-    material_names = options.material_names
+    for material in options.materials:
    for material_name in material_names:
        psk_material = Psk.Material()
        try:
-            psk_material.name = bytes(material_name, encoding='windows-1252')
+            psk_material.name = bytes(material.name, encoding='windows-1252')
        except UnicodeEncodeError:
-            raise RuntimeError(f'Material name "{material_name}" contains characters that cannot be encoded in the Windows-1252 codepage')
+            raise RuntimeError(f'Material name "{material.name}" contains characters that cannot be encoded in the Windows-1252 codepage')
        psk_material.texture_index = len(psk.materials)
        psk_material.poly_flags = triangle_type_and_bit_flags_to_poly_flags(material.psk.mesh_triangle_type,
                                                                            material.psk.mesh_triangle_bit_flags)
        psk.materials.append(psk_material)
-    for input_mesh_object in input_objects.mesh_objects:
+    context.window_manager.progress_begin(0, len(input_objects.mesh_objects))
    material_names = [m.name for m in options.materials]
    for object_index, input_mesh_object in enumerate(input_objects.mesh_objects):
        should_flip_normals = False
        # MATERIALS
        material_indices = [material_names.index(material_slot.material.name) for material_slot in input_mesh_object.material_slots]
@@ -175,8 +183,16 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
            mesh_object.matrix_world = input_mesh_object.matrix_world
            scale = (input_mesh_object.scale.x, input_mesh_object.scale.y, input_mesh_object.scale.z)
-            if any(map(lambda x: x < 0, scale)):
+
-                result.warnings.append(f'Mesh "{input_mesh_object.name}" has negative scaling which may result in inverted normals.')
+            # Negative scaling in Blender results in inverted normals after the scale is applied. However, if the scale
            # is not applied, the normals will appear unaffected in the viewport. The evaluated mesh data used in the
            # export will have the scale applied, but this behavior is not obvious to the user.
            #
            # In order to have the exporter be as WYSIWYG as possible, we need to check for negative scaling and invert
            # the normals if necessary. If two axes have negative scaling and the third has positive scaling, the
            # normals will be correct. We can detect this by checking if the number of negative scaling axes is odd. If
            # it is, we need to invert the normals of the mesh by swapping the order of the vertices in each face.
            should_flip_normals = sum(1 for x in scale if x < 0) % 2 == 1
            # Copy the vertex groups
            for vertex_group in input_mesh_object.vertex_groups:
@@ -205,11 +221,11 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
        # Build a list of non-unique wedges.
        wedges = []
        for loop_index, loop in enumerate(mesh_data.loops):
-            wedge = Psk.Wedge()
+            wedges.append(Psk.Wedge(
-            wedge.point_index = loop.vertex_index + vertex_offset
+                point_index=loop.vertex_index + vertex_offset,
-            wedge.u, wedge.v = uv_layer[loop_index].uv
+                u=uv_layer[loop_index].uv[0],
-            wedge.v = 1.0 - wedge.v
+                v=1.0 - uv_layer[loop_index].uv[1]
-            wedges.append(wedge)
+            ))
        # Assign material indices to the wedges.
        for triangle in mesh_data.loop_triangles:
@@ -217,8 +233,8 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
                wedges[loop_index].material_index = material_indices[triangle.material_index]
        # Populate the list of wedges with unique wedges & build a look-up table of loop indices to wedge indices
-        wedge_indices = {}
+        wedge_indices = dict()
-        loop_wedge_indices = [-1] * len(mesh_data.loops)
+        loop_wedge_indices = np.full(len(mesh_data.loops), -1)
        for loop_index, wedge in enumerate(wedges):
            wedge_hash = hash(wedge)
            if wedge_hash in wedge_indices:
@@ -231,6 +247,7 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
        # FACES
        poly_groups, groups = mesh_data.calc_smooth_groups(use_bitflags=True)
        psk_face_start_index = len(psk.faces)
        for f in mesh_data.loop_triangles:
            face = Psk.Face()
            face.material_index = material_indices[f.material_index]
@@ -240,6 +257,11 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
            face.smoothing_groups = poly_groups[f.polygon_index]
            psk.faces.append(face)
        if should_flip_normals:
            # Invert the normals of the faces.
            for face in psk.faces[psk_face_start_index:]:
                face.wedge_indices[0], face.wedge_indices[2] = face.wedge_indices[2], face.wedge_indices[0]
        # WEIGHTS
        if armature_object is not None:
            armature_data = typing.cast(Armature, armature_object.data)
@@ -288,6 +310,10 @@ def build_psk(context, options: PskBuildOptions) -> PskBuildResult:
            bpy.data.meshes.remove(mesh_data)
            del mesh_data
        context.window_manager.progress_update(object_index)
    context.window_manager.progress_end()
    result.psk = psk
    return result
--- a/io_scene_psk_psa/psk/data.py
+++ b/io_scene_psk_psa/psk/data.py
@@ -1,15 +1,15 @@
 from typing import List
-from ..data import *
+from ..shared.data import *
 class Psk(object):
    class Wedge(object):
-        def __init__(self):
+        def __init__(self, point_index: int, u: float, v: float, material_index: int = 0):
-            self.point_index: int = 0
+            self.point_index: int = point_index
-            self.u: float = 0.0
+            self.u: float = u
-            self.v: float = 0.0
+            self.v: float = v
-            self.material_index: int = 0
+            self.material_index = material_index
        def __hash__(self):
            return hash(f'{self.point_index}-{self.u}-{self.v}-{self.material_index}')
--- a/io_scene_psk_psa/psk/export/operators.py
+++ b/io_scene_psk_psa/psk/export/operators.py
@@ -4,7 +4,7 @@ from bpy_extras.io_utils import ExportHelper
 from ..builder import build_psk, PskBuildOptions, get_psk_input_objects
 from ..writer import write_psk
-from ...helpers import populate_bone_collection_list
+from ...shared.helpers import populate_bone_collection_list
 def is_bone_filter_mode_item_available(context, identifier):
@@ -20,19 +20,19 @@ def is_bone_filter_mode_item_available(context, identifier):
 def populate_material_list(mesh_objects, material_list):
    material_list.clear()
-    material_names = []
+    materials = []
    for mesh_object in mesh_objects:
        for i, material_slot in enumerate(mesh_object.material_slots):
            material = material_slot.material
            # TODO: put this in the poll arg?
            if material is None:
                raise RuntimeError('Material slot cannot be empty (index ' + str(i) + ')')
-            if material.name not in material_names:
+            if material not in materials:
-                material_names.append(material.name)
+                materials.append(material)
-    for index, material_name in enumerate(material_names):
+    for index, material in enumerate(materials):
        m = material_list.add()
-        m.material_name = material_name
+        m.material = material
        m.index = index
@@ -51,7 +51,7 @@ class PSK_OT_material_list_move_up(Operator):
        pg = getattr(context.scene, 'psk_export')
        pg.material_list.move(pg.material_list_index, pg.material_list_index - 1)
        pg.material_list_index -= 1
-        return {"FINISHED"}
+        return {'FINISHED'}
 class PSK_OT_material_list_move_down(Operator):
@@ -69,7 +69,7 @@ class PSK_OT_material_list_move_down(Operator):
        pg = getattr(context.scene, 'psk_export')
        pg.material_list.move(pg.material_list_index, pg.material_list_index + 1)
        pg.material_list_index += 1
-        return {"FINISHED"}
+        return {'FINISHED'}
 class PSK_OT_export(Operator, ExportHelper):
@@ -121,15 +121,17 @@ class PSK_OT_export(Operator, ExportHelper):
        pg = getattr(context.scene, 'psk_export')
        # MESH
-        box = layout.box()
+        mesh_header, mesh_panel = layout.panel('01_mesh', default_closed=False)
-        box.label(text='Mesh', icon='MESH_DATA')
+        mesh_header.label(text='Mesh', icon='MESH_DATA')
-        box.prop(pg, 'use_raw_mesh_data')
+        if mesh_panel:
            mesh_panel.prop(pg, 'use_raw_mesh_data')
        # BONES
-        box = layout.box()
+        bones_header, bones_panel = layout.panel('02_bones', default_closed=False)
-        box.label(text='Bones', icon='BONE_DATA')
+        bones_header.label(text='Bones', icon='BONE_DATA')
        if bones_panel:
            bone_filter_mode_items = pg.bl_rna.properties['bone_filter_mode'].enum_items_static
-        row = box.row(align=True)
+            row = bones_panel.row(align=True)
            for item in bone_filter_mode_items:
                identifier = item.identifier
                item_layout = row.row(align=True)
@@ -137,16 +139,17 @@ class PSK_OT_export(Operator, ExportHelper):
                item_layout.enabled = is_bone_filter_mode_item_available(context, identifier)
            if pg.bone_filter_mode == 'BONE_COLLECTIONS':
-            row = box.row()
+                row = bones_panel.row()
                rows = max(3, min(len(pg.bone_collection_list), 10))
                row.template_list('PSX_UL_bone_collection_list', '', pg, 'bone_collection_list', pg, 'bone_collection_list_index', rows=rows)
-        box.prop(pg, 'should_enforce_bone_name_restrictions')
+            bones_panel.prop(pg, 'should_enforce_bone_name_restrictions')
        # MATERIALS
-        box = layout.box()
+        materials_header, materials_panel = layout.panel('03_materials', default_closed=False)
-        box.label(text='Materials', icon='MATERIAL')
+        materials_header.label(text='Materials', icon='MATERIAL')
-        row = box.row()
+        if materials_panel:
            row = materials_panel.row()
            rows = max(3, min(len(pg.bone_collection_list), 10))
            row.template_list('PSK_UL_materials', '', pg, 'material_list', pg, 'material_list_index', rows=rows)
            col = row.column(align=True)
@@ -159,7 +162,7 @@ class PSK_OT_export(Operator, ExportHelper):
        options.bone_filter_mode = pg.bone_filter_mode
        options.bone_collection_indices = [x.index for x in pg.bone_collection_list if x.is_selected]
        options.use_raw_mesh_data = pg.use_raw_mesh_data
-        options.material_names = [m.material_name for m in pg.material_list]
+        options.materials = [m.material for m in pg.material_list]
        options.should_enforce_bone_name_restrictions = pg.should_enforce_bone_name_restrictions
        try:
--- a/io_scene_psk_psa/psk/export/properties.py
+++ b/io_scene_psk_psa/psk/export/properties.py
@@ -1,18 +1,19 @@
-from bpy.props import EnumProperty, CollectionProperty, IntProperty, BoolProperty, StringProperty
+from bpy.props import EnumProperty, CollectionProperty, IntProperty, BoolProperty, PointerProperty
-from bpy.types import PropertyGroup
+from bpy.types import PropertyGroup, Material
-from ...types import PSX_PG_bone_collection_list_item
+from ...shared.types import PSX_PG_bone_collection_list_item
 empty_set = set()
 class PSK_PG_material_list_item(PropertyGroup):
-    material_name: StringProperty()
+    material: PointerProperty(type=Material)
    index: IntProperty()
 class PSK_PG_export(PropertyGroup):
    bone_filter_mode: EnumProperty(
        name='Bone Filter',
-        options=set(),
+        options=empty_set,
        description='',
        items=(
            ('ALL', 'All', 'All bones will be exported'),
--- a/io_scene_psk_psa/psk/export/ui.py
+++ b/io_scene_psk_psa/psk/export/ui.py
@@ -4,7 +4,7 @@ from bpy.types import UIList
 class PSK_UL_materials(UIList):
    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
        row = layout.row()
-        row.label(text=str(getattr(item, 'material_name')), icon='MATERIAL')
+        row.prop(item.material, 'name', text='', emboss=False, icon_value=layout.icon(item.material))
 classes = (
--- a/io_scene_psk_psa/psk/import_/operators.py
+++ b/io_scene_psk_psa/psk/import_/operators.py
@@ -2,7 +2,7 @@ import os
 import sys
 from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatProperty
-from bpy.types import Operator
+from bpy.types import Operator, FileHandler, Context
 from bpy_extras.io_utils import ImportHelper
 from ..importer import PskImportOptions, import_psk
@@ -11,6 +11,17 @@ from ..reader import read_psk
 empty_set = set()
 class PSK_FH_import(FileHandler):
    bl_idname = 'PSK_FH_import'
    bl_label = 'File handler for Unreal PSK/PSKX import'
    bl_import_operator = 'import_scene.psk'
    bl_file_extensions = '.psk;.pskx'
    @classmethod
    def poll_drop(cls, context: Context):
        return context.area and context.area.type == 'VIEW_3D'
 class PSK_OT_import(Operator, ImportHelper):
    bl_idname = 'import_scene.psk'
    bl_label = 'Import'
@@ -27,8 +38,8 @@ class PSK_OT_import(Operator, ImportHelper):
    should_import_vertex_colors: BoolProperty(
        default=True,
        options=empty_set,
-        name='Vertex Colors',
+        name='Import Vertex Colors',
-        description='Import vertex colors from PSKX files, if available'
+        description='Import vertex colors, if available'
    )
    vertex_color_space: EnumProperty(
        name='Vertex Color Space',
@@ -42,13 +53,13 @@ class PSK_OT_import(Operator, ImportHelper):
    )
    should_import_vertex_normals: BoolProperty(
        default=True,
-        name='Vertex Normals',
+        name='Import Vertex Normals',
        options=empty_set,
        description='Import vertex normals, if available'
    )
    should_import_extra_uvs: BoolProperty(
        default=True,
-        name='Extra UVs',
+        name='Import Extra UVs',
        options=empty_set,
        description='Import extra UV maps, if available'
    )
@@ -63,12 +74,6 @@ class PSK_OT_import(Operator, ImportHelper):
        name='Import Materials',
        options=empty_set,
    )
    should_reuse_materials: BoolProperty(
        default=True,
        name='Reuse Materials',
        options=empty_set,
        description='Existing materials with matching names will be reused when available'
    )
    should_import_skeleton: BoolProperty(
        default=True,
        name='Import Skeleton',
@@ -82,14 +87,20 @@ class PSK_OT_import(Operator, ImportHelper):
        soft_min=1.0,
        name='Bone Length',
        options=empty_set,
        subtype='DISTANCE',
        description='Length of the bones'
    )
    should_import_shape_keys: BoolProperty(
        default=True,
-        name='Shape Keys',
+        name='Import Shape Keys',
        options=empty_set,
        description='Import shape keys, if available'
    )
    scale: FloatProperty(
        name='Scale',
        default=1.0,
        soft_min=0.0,
    )
    def execute(self, context):
        psk = read_psk(self.filepath)
@@ -105,6 +116,11 @@ class PSK_OT_import(Operator, ImportHelper):
        options.bone_length = self.bone_length
        options.should_import_materials = self.should_import_materials
        options.should_import_shape_keys = self.should_import_shape_keys
        options.scale = self.scale
        if not options.should_import_mesh and not options.should_import_skeleton:
            self.report({'ERROR'}, 'Nothing to import')
            return {'CANCELLED'}
        result = import_psk(psk, context, options)
@@ -113,32 +129,48 @@ class PSK_OT_import(Operator, ImportHelper):
            message += '\n'.join(result.warnings)
            self.report({'WARNING'}, message)
        else:
-            self.report({'INFO'}, f'PSK imported')
+            self.report({'INFO'}, f'PSK imported ({options.name})')
        return {'FINISHED'}
    def draw(self, context):
        layout = self.layout
-        layout.prop(self, 'should_import_materials')
+
-        layout.prop(self, 'should_import_mesh')
+        row = layout.row()
-        row = layout.column()
+
-        row.use_property_split = True
+        col = row.column()
-        row.use_property_decorate = False
+        col.use_property_split = True
-        if self.should_import_mesh:
+        col.use_property_decorate = False
-            row.prop(self, 'should_import_vertex_normals')
+        col.prop(self, 'scale')
-            row.prop(self, 'should_import_extra_uvs')
+
-            row.prop(self, 'should_import_vertex_colors')
+        mesh_header, mesh_panel = layout.panel('mesh_panel_id', default_closed=False)
        mesh_header.prop(self, 'should_import_mesh')
        if mesh_panel and self.should_import_mesh:
            row = mesh_panel.row()
            col = row.column()
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(self, 'should_import_materials', text='Materials')
            col.prop(self, 'should_import_vertex_normals', text='Vertex Normals')
            col.prop(self, 'should_import_extra_uvs', text='Extra UVs')
            col.prop(self, 'should_import_vertex_colors', text='Vertex Colors')
            if self.should_import_vertex_colors:
-                row.prop(self, 'vertex_color_space')
+                col.prop(self, 'vertex_color_space')
-            row.prop(self, 'should_import_shape_keys')
+            col.prop(self, 'should_import_shape_keys', text='Shape Keys')
-        layout.prop(self, 'should_import_skeleton')
+
-        row = layout.column()
+        skeleton_header, skeleton_panel = layout.panel('skeleton_panel_id', default_closed=False)
-        row.use_property_split = True
+        skeleton_header.prop(self, 'should_import_skeleton')
-        row.use_property_decorate = False
+
-        if self.should_import_skeleton:
+        if skeleton_panel and self.should_import_skeleton:
-            row.prop(self, 'bone_length')
+            row = skeleton_panel.row()
            col = row.column()
            col.use_property_split = True
            col.use_property_decorate = False
            col.prop(self, 'bone_length')
 classes = (
    PSK_OT_import,
    PSK_FH_import,
 )
--- a/io_scene_psk_psa/psk/importer.py
+++ b/io_scene_psk_psa/psk/importer.py
@@ -1,4 +1,3 @@
 from math import inf
 from typing import Optional, List
 import bmesh
@@ -8,7 +7,8 @@ from bpy.types import VertexGroup
 from mathutils import Quaternion, Vector, Matrix
 from .data import Psk
-from ..helpers import rgb_to_srgb, is_bdk_addon_loaded
+from .properties import poly_flags_to_triangle_type_and_bit_flags
 from ..shared.helpers import rgb_to_srgb, is_bdk_addon_loaded
 class PskImportOptions:
@@ -17,19 +17,20 @@ class PskImportOptions:
        self.should_import_mesh = True
        self.should_reuse_materials = True
        self.should_import_vertex_colors = True
-        self.vertex_color_space = 'sRGB'
+        self.vertex_color_space = 'SRGB'
        self.should_import_vertex_normals = True
        self.should_import_extra_uvs = True
        self.should_import_skeleton = True
        self.should_import_shape_keys = True
        self.bone_length = 1.0
        self.should_import_materials = True
        self.scale = 1.0
 class ImportBone:
-    """
+    '''
    Intermediate bone type for the purpose of construction.
-    """
+    '''
    def __init__(self, index: int, psk_bone: Psk.Bone):
        self.index: int = index
        self.psk_bone: Psk.Bone = psk_bone
@@ -52,6 +53,7 @@ class PskImportResult:
 def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
    result = PskImportResult()
    armature_object = None
    mesh_object = None
    if options.should_import_skeleton:
        # ARMATURE
@@ -133,6 +135,9 @@ def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
                else:
                    # Just create a blank material.
                    material = bpy.data.materials.new(material_name)
                    mesh_triangle_type, mesh_triangle_bit_flags = poly_flags_to_triangle_type_and_bit_flags(psk_material.poly_flags)
                    material.psk.mesh_triangle_type = mesh_triangle_type
                    material.psk.mesh_triangle_bit_flags = mesh_triangle_bit_flags
                    material.use_nodes = True
                mesh_data.materials.append(material)
@@ -144,6 +149,7 @@ def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
        bm.verts.ensure_lookup_table()
        # FACES
        invalid_face_indices = set()
        for face_index, face in enumerate(psk.faces):
            point_indices = map(lambda i: psk.wedges[i].point_index, reversed(face.wedge_indices))
@@ -164,61 +170,59 @@ def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
        bm.to_mesh(mesh_data)
        # TEXTURE COORDINATES
-        data_index = 0
+        uv_layer_data_index = 0
-        uv_layer = mesh_data.uv_layers.new(name='VTXW0000')
+        uv_layer = mesh_data.uv_layers.new(name='UVMap')
        for face_index, face in enumerate(psk.faces):
            if face_index in invalid_face_indices:
                continue
            face_wedges = [psk.wedges[i] for i in reversed(face.wedge_indices)]
            for wedge in face_wedges:
-                uv_layer.data[data_index].uv = wedge.u, 1.0 - wedge.v
+                uv_layer.data[uv_layer_data_index].uv = wedge.u, 1.0 - wedge.v
-                data_index += 1
+                uv_layer_data_index += 1
        # EXTRA UVS
        if psk.has_extra_uvs and options.should_import_extra_uvs:
            extra_uv_channel_count = int(len(psk.extra_uvs) / len(psk.wedges))
            wedge_index_offset = 0
            for extra_uv_index in range(extra_uv_channel_count):
-                data_index = 0
+                uv_layer_data_index = 0
                uv_layer = mesh_data.uv_layers.new(name=f'EXTRAUV{extra_uv_index}')
                for face_index, face in enumerate(psk.faces):
                    if face_index in invalid_face_indices:
                        continue
                    for wedge_index in reversed(face.wedge_indices):
                        u, v = psk.extra_uvs[wedge_index_offset + wedge_index]
-                        uv_layer.data[data_index].uv = u, 1.0 - v
+                        uv_layer.data[uv_layer_data_index].uv = u, 1.0 - v
-                        data_index += 1
+                        uv_layer_data_index += 1
                wedge_index_offset += len(psk.wedges)
        # VERTEX COLORS
        if psk.has_vertex_colors and options.should_import_vertex_colors:
-            size = (len(psk.points), 4)
+            # Convert vertex colors to sRGB if necessary.
-            vertex_colors = np.full(size, inf)
+            psk_vertex_colors = np.zeros((len(psk.vertex_colors), 4))
-            vertex_color_data = mesh_data.vertex_colors.new(name='VERTEXCOLOR')
+            for vertex_color_index in range(len(psk.vertex_colors)):
-            ambiguous_vertex_color_point_indices = []
+                psk_vertex_colors[vertex_color_index,:] = psk.vertex_colors[vertex_color_index].normalized()
            match options.vertex_color_space:
                case 'SRGBA':
                    for i in range(psk_vertex_colors.shape[0]):
                        psk_vertex_colors[i, :3] = tuple(map(lambda x: rgb_to_srgb(x), psk_vertex_colors[i, :3]))
                case _:
                    pass
-            for wedge_index, wedge in enumerate(psk.wedges):
+            # Map the PSK vertex colors to the face corners.
-                point_index = wedge.point_index
+            face_count = len(psk.faces) - len(invalid_face_indices)
-                psk_vertex_color = psk.vertex_colors[wedge_index].normalized()
+            face_corner_colors = np.full((face_count * 3, 4), 1.0)
-                if vertex_colors[point_index, 0] != inf and tuple(vertex_colors[point_index]) != psk_vertex_color:
+            face_corner_color_index = 0
-                    ambiguous_vertex_color_point_indices.append(point_index)
+            for face_index, face in enumerate(psk.faces):
-                else:
+                if face_index in invalid_face_indices:
-                    vertex_colors[point_index] = psk_vertex_color
+                    continue
                for wedge_index in reversed(face.wedge_indices):
                    face_corner_colors[face_corner_color_index] = psk_vertex_colors[wedge_index]
                    face_corner_color_index += 1
-            if options.vertex_color_space == 'SRGBA':
+            # Create the vertex color attribute.
-                for i in range(vertex_colors.shape[0]):
+            face_corner_color_attribute = mesh_data.attributes.new(name='VERTEXCOLOR', type='FLOAT_COLOR', domain='CORNER')
-                    vertex_colors[i, :3] = tuple(map(lambda x: rgb_to_srgb(x), vertex_colors[i, :3]))
+            face_corner_color_attribute.data.foreach_set('color', face_corner_colors.flatten())
            for loop_index, loop in enumerate(mesh_data.loops):
                vertex_color = vertex_colors[loop.vertex_index]
                if vertex_color is not None:
                    vertex_color_data.data[loop_index].color = vertex_color
                else:
                    vertex_color_data.data[loop_index].color = 1.0, 1.0, 1.0, 1.0
            if len(ambiguous_vertex_color_point_indices) > 0:
                result.warnings.append(
                    f'{len(ambiguous_vertex_color_point_indices)} vertex(es) with ambiguous vertex colors.')
        # VERTEX NORMALS
        if psk.has_vertex_normals and options.should_import_vertex_normals:
@@ -266,6 +270,9 @@ def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
            armature_modifier.object = armature_object
            mesh_object.parent = armature_object
    root_object = armature_object if options.should_import_skeleton else mesh_object
    root_object.scale = (options.scale, options.scale, options.scale)
    try:
        bpy.ops.object.mode_set(mode='OBJECT')
    except:
--- a/io_scene_psk_psa/psk/properties.py
+++ b/io_scene_psk_psa/psk/properties.py
@@ -0,0 +1,48 @@
 from bpy.props import EnumProperty
 from bpy.types import PropertyGroup
 mesh_triangle_types_items = (
    ('NORMAL', 'Normal', 'Normal one-sided', 0),
    ('NORMAL_TWO_SIDED', 'Normal Two-Sided', 'Normal but two-sided', 1),
    ('TRANSLUCENT', 'Translucent', 'Translucent two-sided', 2),
    ('MASKED', 'Masked', 'Masked two-sided', 3),
    ('MODULATE', 'Modulate', 'Modulation blended two-sided', 4),
    ('PLACEHOLDER', 'Placeholder', 'Placeholder triangle for positioning weapon. Invisible', 8),
 )
 mesh_triangle_bit_flags_items = (
    ('UNLIT', 'Unlit', 'Full brightness, no lighting', 16),
    ('FLAT', 'Flat', 'Flat surface, don\'t do bMeshCurvy thing', 32),
    ('ENVIRONMENT', 'Environment', 'Environment mapped', 64),
    ('NO_SMOOTH', 'No Smooth', 'No bilinear filtering on this poly\'s texture', 128),
 )
 class PSX_PG_material(PropertyGroup):
    mesh_triangle_type: EnumProperty(items=mesh_triangle_types_items, name='Triangle Type')
    mesh_triangle_bit_flags: EnumProperty(items=mesh_triangle_bit_flags_items, name='Triangle Bit Flags',
                                          options={'ENUM_FLAG'})
 mesh_triangle_types_items_dict = {item[0]: item[3] for item in mesh_triangle_types_items}
 mesh_triangle_bit_flags_items_dict = {item[0]: item[3] for item in mesh_triangle_bit_flags_items}
 def triangle_type_and_bit_flags_to_poly_flags(mesh_triangle_type: str, mesh_triangle_bit_flags: set[str]) -> int:
    poly_flags = 0
    poly_flags |= mesh_triangle_types_items_dict.get(mesh_triangle_type, 0)
    for flag in mesh_triangle_bit_flags:
        poly_flags |= mesh_triangle_bit_flags_items_dict.get(flag, 0)
    return poly_flags
 def poly_flags_to_triangle_type_and_bit_flags(poly_flags: int) -> (str, set[str]):
    try:
        triangle_type = next(item[0] for item in mesh_triangle_types_items if item[3] == (poly_flags & 15))
    except StopIteration:
        triangle_type = 'NORMAL'
    triangle_bit_flags = {item[0] for item in mesh_triangle_bit_flags_items if item[3] & poly_flags}
    return triangle_type, triangle_bit_flags
 classes = (
    PSX_PG_material,
 )
--- a/io_scene_psk_psa/psk/reader.py
+++ b/io_scene_psk_psa/psk/reader.py
@@ -23,7 +23,7 @@ def _read_material_references(path: str) -> List[str]:
        return []
    # Do a crude regex match to find the Material list entries.
    contents = property_file_path.read_text()
-    pattern = r"Material\s*=\s*([^\s^,]+)"
+    pattern = r'Material\s*=\s*([^\s^,]+)'
    return re.findall(pattern, contents)
--- a/io_scene_psk_psa/psk/ui.py
+++ b/io_scene_psk_psa/psk/ui.py
@@ -0,0 +1,28 @@
 from bpy.types import Panel
 class PSK_PT_material(Panel):
    bl_label = 'PSK Material'
    bl_idname = 'PSK_PT_material'
    bl_space_type = 'PROPERTIES'
    bl_region_type = 'WINDOW'
    bl_context = 'material'
    bl_options = {'DEFAULT_CLOSED'}
    @classmethod
    def poll(cls, context):
        return context.material is not None
    def draw(self, context):
        layout = self.layout
        layout.use_property_split = True
        layout.use_property_decorate = False
        material = context.material
        layout.prop(material.psk, 'mesh_triangle_type')
        col = layout.column()
        col.prop(material.psk, 'mesh_triangle_bit_flags', expand=True, text='Flags')
 classes = (
    PSK_PT_material,
 )
--- a/io_scene_psk_psa/psk/writer.py
+++ b/io_scene_psk_psa/psk/writer.py
@@ -2,11 +2,11 @@ from ctypes import Structure, sizeof
 from typing import Type
 from .data import Psk
-from ..data import Section, Vector3
+from ..shared.data import Section, Vector3
 MAX_WEDGE_COUNT = 65536
 MAX_POINT_COUNT = 4294967296
-MAX_BONE_COUNT = 256
+MAX_BONE_COUNT = 2147483647
 MAX_MATERIAL_COUNT = 256
--- a/io_scene_psk_psa/shared/init.py
+++ b/io_scene_psk_psa/shared/init.py
--- a/io_scene_psk_psa/shared/data.py
+++ b/io_scene_psk_psa/shared/data.py
--- a/io_scene_psk_psa/shared/helpers.py
+++ b/io_scene_psk_psa/shared/helpers.py
--- a/io_scene_psk_psa/shared/types.py
+++ b/io_scene_psk_psa/shared/types.py
@@ -51,5 +51,5 @@ classes = (
    PSX_PG_action_export,
    PSX_PG_bone_collection_list_item,
    PSX_UL_bone_collection_list,
-    PSX_PT_action
+    PSX_PT_action,
 )
Author	SHA1	Message	Date
Colin Basnett	275f246458	Update main.yml	2024-06-09 12:04:57 -07:00
Colin Basnett	80aa65f771	Update main.yml	2024-06-08 16:41:03 -07:00
Colin Basnett	27548979d5	Create main.yml	2024-06-08 16:35:52 -07:00
Colin Basnett	aa9fdca6cc	Moved all the source files into a nested `io_scene_psk_psa` folder in preparation for CI workflow Also changed the license to GPLv3	2024-06-07 23:05:58 -07:00
Colin Basnett	5c83b8974a	Merge branch 'master' into blender-4.2	2024-06-06 23:53:05 -07:00
Colin Basnett	4d3630893e	Fixed capitalization for mix-in class	2024-06-06 23:52:25 -07:00
Colin Basnett	f664e7714b	Merge pull request #95 from Blaco/fix-psa-import-metaclass Resolved metaclass conflict in PSA_UL_sequences	2024-06-06 19:23:32 -07:00
Taco	447687b588	Resolved metaclass conflict in PSA_UL_sequences This was breaking the 'Add Theme Preset' button in Blender's preferences, this small change fixes that	2024-06-05 19:52:35 -04:00
Colin Basnett	8df7b4b141	Fixed not being able to properly run reload scripts on the addon	2024-05-31 18:52:33 -07:00
Colin Basnett	cab8338a69	Changed the name of the add-on to something simpler	2024-05-27 16:21:31 -07:00
Colin Basnett	9dcd3778e0	Selected non-mesh objects will now be ignored on PSK export instead of blocking the operator from being invoked	2024-05-27 16:03:18 -07:00
Colin Basnett	fdb74ef7d0	Moved things around for packaging on Blender extensions	2024-05-27 14:56:37 -07:00
Colin Basnett	a47b4a1e04	Fixed a bug where the compression ratio and key quotas were not being correctly evaluated on NLA track strip sources	2024-05-19 15:15:21 -07:00
Colin Basnett	0202263dea	Fixed a bug where using the animation override would not correctly populate the NLA Track Strips list	2024-05-19 14:31:14 -07:00
Colin Basnett	7df032f504	Pose markers that begin with a `!` character now export only the first frame Without this, it is impossible to export sequences as a single frame using pose markers.	2024-04-07 12:30:23 -07:00
Colin Basnett	4c00771f53	Imported PSKs will now have the first UV layer named `UVMap` instead of `VTXW0000` This is because it caused issues for some folks when joining meshes made in Blender and meshes imported from a PSK. There would be two UV maps, and if the user wanted to make them share the same UVMap, they would need to go out of their way to fix the naming of the UV layers to match.	2024-04-07 12:28:06 -07:00
Colin Basnett	c7b23e8c0d	The PSK export operator now uses the new Blender 4.1 panels instead of the layout boxes	2024-04-07 12:26:13 -07:00
Colin Basnett	d107a56007	Fixed duplicate code issue	2024-03-25 23:52:36 -07:00
Colin Basnett	a5bef57c8d	Merge branch 'master' into blender-4.1 # Conflicts: # io_scene_psk_psa/psa/importer.py	2024-03-25 23:39:17 -07:00
Colin Basnett	44a55fc698	Fix for #83 Bones whose parents are not present in the PSA will now simply use the actual armature parent bone instead of failing the look-up and treating the bone as a root bone.	2024-03-25 20:20:33 -07:00
Colin Basnett	09cc9e5d51	Added PSA resampling Fixed PSA import resampling logic	2024-03-25 02:57:32 -07:00
Colin Basnett	d92f2d77d2	Incremented version to 6.2.1	2024-03-25 02:11:13 -07:00
Colin Basnett	9c8b9d922b	Fix for issue where using case insensitive bone mapping would fail Also made case-insensitive bone mapping the default for PSA import	2024-03-25 02:10:00 -07:00
Colin Basnett	20b072f87b	Fix for root bone being incorrectly oriented if it wasn't at the identity rotation in the bind pose	2024-03-25 02:08:51 -07:00
Colin Basnett	bd667d4833	Update README.md	2024-03-14 19:13:48 -07:00
Colin Basnett	fb02742381	Reorganizing & renaming some things for clarity and correctness	2024-03-14 19:08:32 -07:00
Colin Basnett	d4d46bea66	PSA import dialog now uses new Blender 4.1 UI panels	2024-03-14 19:06:29 -07:00
Colin Basnett	a93450eab9	Added PSA file handler	2024-03-14 19:06:03 -07:00
Colin Basnett	c65fdaa6a4	Fixing PEP warnings	2024-03-14 19:04:12 -07:00
Colin Basnett	6b8088225a	Fix for root bone being incorrectly oriented if it wasn't at the identity rotation in the bind pose	2024-03-14 18:55:28 -07:00
Colin Basnett	e27b078866	Now handling PSKX files in the PSK file handler	2024-03-14 18:53:53 -07:00
Colin Basnett	b67c734687	Merge branch 'master' into blender-4.1	2024-03-11 18:46:24 -07:00
Colin Basnett	226e403925	Fix for syntax error	2024-03-11 18:46:18 -07:00
Colin Basnett	d81477673b	Fixed a script reload issue	2024-03-02 13:15:48 -08:00
Colin Basnett	4d41f1af83	When exporting PSKs, armatures with no bones are now more sensibly handled umodel, for some reason, exports some models with no bones. For compatibility and convenience, an armature with no bones may as well not exist, so we treat it as though it doesn't on export, and a single fake root bone is added for maximum compatibility.	2024-03-01 15:14:37 -08:00
Colin Basnett	5d3c7cc570	Fixed PSA import resampling logic	2024-02-29 16:03:47 -08:00
Colin Basnett	15e2c6ccdd	Importing PSKs with poly flags now works	2024-02-29 00:32:42 -08:00
Colin Basnett	14116963bb	Incremented version to 6.2.0	2024-02-28 23:21:31 -08:00
Colin Basnett	ead1e3c793	Initial commit of UT99 poly flags	2024-02-28 00:51:33 -08:00
Colin Basnett	ce1a411200	Fix for issue #76	2024-02-17 23:01:42 -08:00
Colin Basnett	11bf205fe2	Added PSA resampling on import + some fixes for 4.1	2024-02-13 14:03:04 -08:00
Colin Basnett	f7bbe911ea	Removed `use_auto_smooth`...again	2024-02-13 00:19:12 -08:00
Colin Basnett	8c49c8f34e	Merge branch 'master' into blender-4.1	2024-02-12 18:02:59 -08:00
Colin Basnett	82eaddf1cb	Increased max bone count to int32 limit	2024-02-12 11:06:52 -08:00
Colin Basnett	eb8cee6973	Markers with empty names are now ignored as export options	2024-02-06 13:29:34 -08:00
Colin Basnett	c2d7eecb4f	Minor naming changes and refactoring	2024-02-06 13:26:48 -08:00
Colin Basnett	44100a50f0	Added better handling for exporting meshes with negative scaling The exporter now corrects the face normals of meshes with negative scaling that would otherwise be inverted on export. The face orientation should now always match what is seen in the viewport.	2024-02-06 13:19:45 -08:00
Colin Basnett	9125606bc4	Fix for issue #71	2024-02-02 12:28:45 -08:00
Colin Basnett	0a7804b5ab	Improved reporting of PSK import error when there is nothing selected to import	2024-01-27 00:42:51 -08:00
Colin Basnett	ced03afafe	Added "Scale" option for PSK import	2024-01-25 11:43:13 -08:00
Colin Basnett	9438a35cd1	Fixed a bug where any invalid faces would result in import failure if also importing vertex colors	2024-01-24 18:46:03 -08:00
Colin Basnett	5a870104f1	Added TODO about 4.1 compatibility	2024-01-22 15:23:16 -08:00
Colin Basnett	564f7ec221	All string literals now use single-quotes instead of double-quotes where possible	2024-01-22 15:23:01 -08:00
Colin Basnett	b2f5985681	Improved PSK vertex color importing to be per-corner instead of per-vertex Previously, the importer was storing the vertex colors in the point domain. However, the PSK itself stores colors per "wedge", which maps to corners, resulting in the "ambiguous vertex colors" warning if two corners mapped to the same vertex but had different colors. The new method is now more correct and doesn't discard data.	2024-01-22 14:56:51 -08:00
Colin Basnett	3d3bbb9296	Set the subtype of the bone length property on PSK import to distance	2024-01-22 14:50:06 -08:00
Colin Basnett	fda976d083	Incremented version to 6.1.2	2024-01-22 11:32:06 -08:00
Colin Basnett	7e6911c709	PSK files imported with custom normals will now have `Auto Smooth` enabled by default (#67 )	2024-01-22 11:26:25 -08:00
Colin Basnett	30586fa8bb	Merge branch 'master' of https://github.com/DarklightGames/io_scene_psk_psa	2024-01-20 15:31:37 -08:00
Colin Basnett	361a7f0218	Added the name of the imported PSK object to the info report	2024-01-20 15:31:26 -08:00
Colin Basnett	b471229584	Rephrased description of PSA export option	2024-01-20 15:25:48 -08:00
Colin Basnett	d0f64a6546	Incremented version to 6.1.1	2024-01-20 15:25:14 -08:00
Colin Basnett	82310d695c	Fix for parsing errors on .config files coming from UEViewer	2024-01-20 15:25:00 -08:00
Colin Basnett	e9ba117fa9	Added file handler for PSK/PSKX files	2024-01-20 14:48:18 -08:00
Colin Basnett	0c11b326af	Update README.md	2024-01-16 20:21:12 -08:00
Colin Basnett	d0fe7d9786	Added progress indicator when exporting PSK files	2023-11-22 19:20:16 -08:00
Colin Basnett	68c7d93d6a	Incremented version to 6.1.0	2023-11-22 19:19:49 -08:00
Colin Basnett	e5fa255899	Merge branch 'psa-config'	2023-11-22 19:18:41 -08:00
Colin Basnett	3cf10abe91	Update README.md	2023-11-20 13:39:26 -08:00
Colin Basnett	76440affdb	Initial commit for handling the PSA config	2023-11-07 18:33:18 -08:00