Merge branch 'master' into extras_property_callback

include/assimp/ai_assert.h

@@ -42,12 +42,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_ASSERT_H_INC
 #define AI_ASSERT_H_INC
 
+#include <assimp/defs.h>
+
 #if defined(ASSIMP_BUILD_DEBUG)
 
 namespace Assimp
 {
     // Assert violation behavior can be customized: see AssertHandler.h.
-    void aiAssertViolation(const char* failedExpression, const char* file, int line);
+    ASSIMP_API void aiAssertViolation(const char* failedExpression, const char* file, int line);
 }
 
 #    define ai_assert(expression) (void)((!!(expression)) || (Assimp::aiAssertViolation(#expression, __FILE__, __LINE__), 0))

include/assimp/cimport.h

@@ -1044,7 +1044,7 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
     const C_STRUCT aiMatrix4x4* mat,
     C_STRUCT aiVector3D* scaling,
     C_STRUCT aiVector3D* axis,
-    float* angle,
+    ai_real* angle,
     C_STRUCT aiVector3D* position);
 
 // --------------------------------------------------------------------------------