From 18cb5745bce13561bc17ced52739ec039d5f92a2 Mon Sep 17 00:00:00 2001
From: iamAdrianIusca <iamAdrianIusca@gmail.com>
Date: Mon, 9 Mar 2020 22:21:36 +0200
Subject: [PATCH] fixing the conflicts

---
 code/PostProcessing/SplitByBoneCountProcess.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/PostProcessing/SplitByBoneCountProcess.cpp b/code/PostProcessing/SplitByBoneCountProcess.cpp
index 41f2e3499..de8badf2f 100644
--- a/code/PostProcessing/SplitByBoneCountProcess.cpp
+++ b/code/PostProcessing/SplitByBoneCountProcess.cpp
@@ -75,7 +75,7 @@ SplitByBoneCountProcess::~SplitByBoneCountProcess()
 // Returns whether the processing step is present in the given flag.
 bool SplitByBoneCountProcess::IsActive( unsigned int pFlags) const
 {
-    return (pFlags & aiProcess_SplitByBoneCount) != 0;
+	return !!(pFlags & aiProcess_SplitByBoneCount);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -172,7 +172,7 @@ void SplitByBoneCountProcess::SplitMesh( const aiMesh* pMesh, std::vector<aiMesh
         const aiBone* bone = pMesh->mBones[a];
         for( unsigned int b = 0; b < bone->mNumWeights; ++b)
         {
-            vertexBones[ bone->mWeights[b].mVertexId ].emplace_back( a, bone->mWeights[b].mWeight);
+	        vertexBones[ bone->mWeights[b].mVertexId ].push_back( BoneWeight( a, bone->mWeights[b].mWeight));
         }
     }