godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

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

Browse Source 
Fix importing GLTF meshes as external files.
This commit is contained in:
Rémi Verschelde
2017-12-10 00:13:01 +01:00
committed by GitHub
parent 4fd26d89c1 74b68d2e71
commit 58e8da57de
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/import/editor_scene_importer_gltf.cpp
View File

@@ -1597,8 +1597,11 @@ void EditorSceneImporterGLTF::_generate_node(GLTFState &state, int p_node, Node
if (n->mesh >= 0) { if (n->mesh >= 0) {
ERR_FAIL_INDEX(n->mesh, state.meshes.size()); ERR_FAIL_INDEX(n->mesh, state.meshes.size());
MeshInstance *mi = memnew(MeshInstance); MeshInstance *mi = memnew(MeshInstance);
const GLTFMesh &mesh = state.meshes[n->mesh]; GLTFMesh &mesh = state.meshes[n->mesh];
mi->set_mesh(mesh.mesh); mi->set_mesh(mesh.mesh);
if (mesh.mesh->get_name() == "") {
mesh.mesh->set_name(n->name);
}
for (int i = 0; i < mesh.blend_weights.size(); i++) { for (int i = 0; i < mesh.blend_weights.size(); i++) {
mi->set("blend_shapes/" + mesh.mesh->get_blend_shape_name(i), mesh.blend_weights[i]); mi->set("blend_shapes/" + mesh.mesh->get_blend_shape_name(i), mesh.blend_weights[i]);
} }