Merge branch 'master' into master

This commit is contained in:
Kim Kulling
2020-02-19 21:52:57 +01:00
committed by GitHub
16 changed files with 169 additions and 129 deletions
+5
View File
@@ -926,6 +926,11 @@ aiNode *ImportNode(aiScene *pScene, glTF2::Asset &r, std::vector<unsigned int> &
if (node.camera) {
pScene->mCameras[node.camera.GetIndex()]->mName = ainode->mName;
if (node.translation.isPresent) {
aiVector3D trans;
CopyValue(node.translation.value, trans);
pScene->mCameras[node.camera.GetIndex()]->mPosition = trans;
}
}
if (node.light) {