Merge branch 'master' into gltf2_buffer_fixes
commit
87a6305cf0
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue