mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-17 22:43:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12868 from Web-eWorks/gltf-fixes

Browse Source 
Fix #12056: Crash while loading gtlf files.
This commit is contained in:
Rémi Verschelde 2017-11-13 08:20:56 +01:00 committed by GitHub
commit 77d3c26fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/import/editor_scene_importer_gltf.cpp
View File

@ -1,5 +1,6 @@
#include "editor_scene_importer_gltf.h"
#include "io/json.h"
#include "math_defs.h"
#include "os/file_access.h"
#include "os/os.h"
#include "scene/3d/camera.h"
@ -1378,8 +1379,8 @@ Error EditorSceneImporterGLTF::_parse_skins(GLTFState &state) {
state.nodes[skin_node]->skeleton_children.push_back(i);
}
state.skins.push_back(skin);
}
state.skins.push_back(skin);
}
print_line("total skins: " + itos(state.skins.size()));
@ -1419,7 +1420,8 @@ Error EditorSceneImporterGLTF::_parse_cameras(GLTFState &state) {
camera.perspective = true;
if (d.has("perspective")) {
Dictionary ppt = d["perspective"];
camera.fov_size = ppt["yfov"];
// GLTF spec is in radians, Godot's camera is in degrees.
camera.fov_size = (double)ppt["yfov"] * 180.0 / Math_PI;
camera.zfar = ppt["zfar"];
camera.znear = ppt["znear"];
} else {