Fix build

master
Jeremy Hu 2018-11-02 10:30:17 +08:00
parent bd358d4de7
commit 0d45d65b98
2 changed files with 3 additions and 8 deletions

View File

@ -507,8 +507,8 @@ bool GenericRigger::rig()
void GenericRigger::normalizeButtonColumns()
{
int minColumn = std::numeric_limits<int>::max();
int maxColumn = std::numeric_limits<int>::min();
double minColumn = std::numeric_limits<int>::max();
double maxColumn = std::numeric_limits<int>::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;

View File

@ -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();
}