Merge branch 'master' into gltf2_buffer_fixes

pull/3575/head
Kim Kulling 2021-01-12 18:32:17 +01:00 committed by GitHub
commit 87a6305cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions

View File

@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2020, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,
@ -117,7 +116,7 @@ public:
Mask = 0xf, Mask = 0xf,
}; };
inline constexpr uint8_t GetType() const { return (flags & Mask); } inline const uint8_t GetType() const { return (flags & Mask); }
}; };
// Represents an AC3D object // Represents an AC3D object