build on Linux with gcc and clang; warning as error only for 'assimp' target
This commit is contained in:
@@ -979,7 +979,7 @@ void GetArrayCopy(Type*& dest, ai_uint num ) {
|
||||
|
||||
dest = new Type[num];
|
||||
::memcpy(dest, old, sizeof(Type) * num);
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
void SceneCombiner::CopySceneFlat(aiScene** _dest,const aiScene* src) {
|
||||
@@ -1065,7 +1065,7 @@ void SceneCombiner::Copy( aiMesh** _dest, const aiMesh* src ) {
|
||||
aiMesh* dest = *_dest = new aiMesh();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiMesh));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
GetArrayCopy( dest->mVertices, dest->mNumVertices );
|
||||
@@ -1104,7 +1104,7 @@ void SceneCombiner::Copy(aiAnimMesh** _dest, const aiAnimMesh* src) {
|
||||
aiAnimMesh* dest = *_dest = new aiAnimMesh();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest, src, sizeof(aiAnimMesh));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
GetArrayCopy(dest->mVertices, dest->mNumVertices);
|
||||
@@ -1161,7 +1161,7 @@ void SceneCombiner::Copy(aiTexture** _dest, const aiTexture* src) {
|
||||
aiTexture* dest = *_dest = new aiTexture();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiTexture));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays. We must do it manually here
|
||||
const char* old = (const char*)dest->pcData;
|
||||
@@ -1191,7 +1191,7 @@ void SceneCombiner::Copy( aiAnimation** _dest, const aiAnimation* src ) {
|
||||
aiAnimation* dest = *_dest = new aiAnimation();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiAnimation));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
CopyPtrArray( dest->mChannels, src->mChannels, dest->mNumChannels );
|
||||
@@ -1207,7 +1207,7 @@ void SceneCombiner::Copy(aiNodeAnim** _dest, const aiNodeAnim* src) {
|
||||
aiNodeAnim* dest = *_dest = new aiNodeAnim();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiNodeAnim));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
GetArrayCopy( dest->mPositionKeys, dest->mNumPositionKeys );
|
||||
@@ -1223,7 +1223,7 @@ void SceneCombiner::Copy(aiMeshMorphAnim** _dest, const aiMeshMorphAnim* src) {
|
||||
aiMeshMorphAnim* dest = *_dest = new aiMeshMorphAnim();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiMeshMorphAnim));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
GetArrayCopy( dest->mKeys, dest->mNumKeys );
|
||||
@@ -1244,7 +1244,7 @@ void SceneCombiner::Copy( aiCamera** _dest,const aiCamera* src) {
|
||||
aiCamera* dest = *_dest = new aiCamera();
|
||||
|
||||
// get a flat copy, that's already OK
|
||||
::memcpy(dest,src,sizeof(aiCamera));
|
||||
*dest = *src;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
@@ -1256,7 +1256,7 @@ void SceneCombiner::Copy(aiLight** _dest, const aiLight* src) {
|
||||
aiLight* dest = *_dest = new aiLight();
|
||||
|
||||
// get a flat copy, that's already OK
|
||||
::memcpy(dest,src,sizeof(aiLight));
|
||||
*dest = *src;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
@@ -1268,7 +1268,7 @@ void SceneCombiner::Copy(aiBone** _dest, const aiBone* src) {
|
||||
aiBone* dest = *_dest = new aiBone();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiBone));
|
||||
*dest = *src;
|
||||
|
||||
// and reallocate all arrays
|
||||
GetArrayCopy( dest->mWeights, dest->mNumWeights );
|
||||
@@ -1282,7 +1282,7 @@ void SceneCombiner::Copy (aiNode** _dest, const aiNode* src)
|
||||
aiNode* dest = *_dest = new aiNode();
|
||||
|
||||
// get a flat copy
|
||||
::memcpy(dest,src,sizeof(aiNode));
|
||||
*dest = *src;
|
||||
|
||||
if (src->mMetaData) {
|
||||
Copy(&dest->mMetaData, src->mMetaData);
|
||||
|
||||
Reference in New Issue
Block a user