#22394 - Tidied up version of the Softimage engine