diff options
| author | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
| commit | e46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch) | |
| tree | cf91f2869ff8f058c6682569fb31e22e5ee736ad /tools/editor/io_plugins/editor_import_collada.cpp | |
| parent | 1dad6eca812e5c2e313b54265114de8a1d73d999 (diff) | |
| parent | 4a4f2479146aa33e235ed57cde311efda68d3c8f (diff) | |
| download | godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip | |
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to 'tools/editor/io_plugins/editor_import_collada.cpp')
| -rw-r--r-- | tools/editor/io_plugins/editor_import_collada.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp index 7de9d978f..f008c4a73 100644 --- a/tools/editor/io_plugins/editor_import_collada.cpp +++ b/tools/editor/io_plugins/editor_import_collada.cpp @@ -1372,7 +1372,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con DVector<float> tangents; print_line("vertex source id: "+vertex_src_id); if(md.vertices[vertex_src_id].sources.has("NORMAL")){ - //has normals + //has normals normals.resize(vlen); //std::cout << "has normals" << std::endl; String normal_src_id = md.vertices[vertex_src_id].sources["NORMAL"]; @@ -1386,7 +1386,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con if (stride==0) stride=3; - + //read normals from morph target DVector<Vector3>::Write vertw = normals.write(); @@ -1421,7 +1421,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con } } } - + print_line("using built-in normals"); }else{ print_line("generating normals"); @@ -2070,7 +2070,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones animation->add_track(Animation::TYPE_TRANSFORM); - int track = animation->get_track_count() -1; + int track = animation->get_track_count() -1; animation->track_set_path( track , path ); Vector<float> snapshots = base_snapshots; |