Merge branch 'master' into preserve_error_string

2019-12-02 10:35:29 +00:00
parent 6f7cb6af06 6117c3f589
commit 631da3a3d1
46 changed files with 4770 additions and 2759 deletions
@@ -62,6 +62,13 @@ extern "C" {
 */
 ASSIMP_API const char*  aiGetLegalString  (void);

+// ---------------------------------------------------------------------------
+/** @brief Returns the current patch version number of Assimp.
+ *  @return Patch version of the Assimp runtime the application was
+ *    linked/built against
+ */
+ASSIMP_API unsigned int aiGetVersionPatch(void);
+
 // ---------------------------------------------------------------------------
 /** @brief Returns the current minor version number of Assimp.
 *  @return Minor version of the Assimp runtime the application was