aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCarl Olsson2015-03-23 08:31:54 +1000
committerCarl Olsson2015-03-23 08:31:54 +1000
commitb9bd83e178e6332ee31c6efd084503a80446fd27 (patch)
tree6c9493e058656a2b96c4c51c4ae6cdf6d3a74dd5 /tools
parent817f9debe787fc8001c03407f924f61fd5f0f7ad (diff)
parentc68563aeb46514d35f5ae7b8006f8218c716782e (diff)
downloadgodot-b9bd83e178e6332ee31c6efd084503a80446fd27.tar.gz
godot-b9bd83e178e6332ee31c6efd084503a80446fd27.tar.zst
godot-b9bd83e178e6332ee31c6efd084503a80446fd27.zip
Merge branch 'master' of https://github.com/not-surt/godot into snapping2
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/io_plugins/editor_import_collada.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index c12fb0535..990e52be4 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -1361,9 +1361,9 @@ Error ColladaImport::_create_mesh_surfaces(Ref<Mesh>& p_mesh,const Map<String,Co
if(md.vertices[vertex_src_id].sources.has("NORMAL")){
//has normals
normals.resize(vlen);
- std::cout << "has normals" << std::endl;
+ //std::cout << "has normals" << std::endl;
String normal_src_id = md.vertices[vertex_src_id].sources["NORMAL"];
- std::cout << "normals source: "<< normal_src_id.utf8().get_data() <<std::endl;
+ //std::cout << "normals source: "<< normal_src_id.utf8().get_data() <<std::endl;
ERR_FAIL_COND_V(!md.sources.has(normal_src_id),ERR_INVALID_DATA);
const Collada::MeshData::Source *m=&md.sources[normal_src_id];