From 0d45d65b983756639d2f3764c46e88ce751306da Mon Sep 17 00:00:00 2001 From: Jeremy Hu Date: Fri, 2 Nov 2018 10:30:17 +0800 Subject: [PATCH] Fix build --- src/genericrigger.cpp | 6 +++--- src/main.cpp | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/genericrigger.cpp b/src/genericrigger.cpp index ead5cf9a..2822b28a 100644 --- a/src/genericrigger.cpp +++ b/src/genericrigger.cpp @@ -507,8 +507,8 @@ bool GenericRigger::rig() void GenericRigger::normalizeButtonColumns() { - int minColumn = std::numeric_limits::max(); - int maxColumn = std::numeric_limits::min(); + double minColumn = std::numeric_limits::max(); + double maxColumn = std::numeric_limits::min(); for (const auto &bone: m_resultBones) { if (!bone.hasButton) continue; @@ -517,7 +517,7 @@ void GenericRigger::normalizeButtonColumns() if (bone.button.second > maxColumn) maxColumn = bone.button.second; } - int columnNumOfOneSide = std::max(std::abs(minColumn), std::abs(maxColumn)); + int columnNumOfOneSide = (int)std::max(std::abs(minColumn), std::abs(maxColumn)); for (auto &bone: m_resultBones) { if (!bone.hasButton) continue; diff --git a/src/main.cpp b/src/main.cpp index 1c89dfcd..a3172576 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,7 +8,6 @@ #include "documentwindow.h" #include "theme.h" #include "version.h" -//#include "fbxdocument.h" int main(int argc, char ** argv) { @@ -49,9 +48,5 @@ int main(int argc, char ** argv) SkeletonDocumentWindow::createDocumentWindow(); - //fbx::FBXDocument fbxDoc; - //fbxDoc.read("/Users/jeremy/Desktop/test.fbx"); - //fbxDoc.print(); - return app.exec(); }