diff --git a/dust3d.pro b/dust3d.pro index e798d2e5..36190fca 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -12,10 +12,10 @@ macx { } isEmpty(HUMAN_VERSION) { - HUMAN_VERSION = "1.0.0-beta.14" + HUMAN_VERSION = "1.0.0-beta.15" } isEmpty(VERSION) { - VERSION = 1.0.0.14 + VERSION = 1.0.0.15 } REPOSITORY_URL = "https://github.com/huxingyi/dust3d" @@ -25,7 +25,7 @@ REFERENCE_GUIDE_URL = "http://docs.dust3d.org" QMAKE_TARGET_COMPANY = Dust3D QMAKE_TARGET_PRODUCT = Dust3D QMAKE_TARGET_DESCRIPTION = "Dust3D is a cross-platform open-source 3D modeling software" -QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2018 Dust3D Project. All Rights Reserved." +QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2018-2019 Dust3D Project. All Rights Reserved." DEFINES += "PROJECT_DEFINED_APP_COMPANY=\"\\\"$$QMAKE_TARGET_COMPANY\\\"\"" DEFINES += "PROJECT_DEFINED_APP_NAME=\"\\\"$$QMAKE_TARGET_PRODUCT\\\"\"" diff --git a/thirdparty/simpleuv/simpleuv/triangulate.cpp b/thirdparty/simpleuv/simpleuv/triangulate.cpp index 52c38b8d..8869fc97 100644 --- a/thirdparty/simpleuv/simpleuv/triangulate.cpp +++ b/thirdparty/simpleuv/simpleuv/triangulate.cpp @@ -15,7 +15,7 @@ static QVector3D norm(const QVector3D &p1, const QVector3D &p2, const QVector3D static float angle360(const QVector3D &a, const QVector3D &b, const QVector3D &direct) { - auto angle = std::acos(QVector3D::dotProduct(a, b)) * 180.0 / 3.1415926; + auto angle = atan2(QVector3D::crossProduct(a, b).length(), QVector3D::dotProduct(a, b)) * 180.0 / 3.1415926; auto c = QVector3D::crossProduct(a, b); if (QVector3D::dotProduct(c, direct) < 0) { angle += 180;