From 308d405c31f83ce538fea76d6e88931718afc012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 24 Jul 2016 00:02:19 +0200
Subject: [PATCH] Turn some prints to error logs, remove others

Fixes #5876 in passing.
---
 core/io/image_loader.cpp                           |  3 +--
 core/math/geometry.cpp                             | 14 +++++++-------
 core/object_type_db.cpp                            |  2 +-
 tools/editor/editor_file_system.cpp                |  2 +-
 .../io_plugins/editor_mesh_import_plugin.cpp       |  1 -
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp
index 05bad97e90e..ac6c00dc61d 100644
--- a/core/io/image_loader.cpp
+++ b/core/io/image_loader.cpp
@@ -51,7 +51,7 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
 		Error err;
 		f=FileAccess::open(p_file,FileAccess::READ,&err);
 		if (!f) {
-			print_line("ERROR OPENING FILE: "+p_file);
+			ERR_PRINTS("Error opening file: "+p_file);
 			return err;
 		}
 	}
@@ -76,7 +76,6 @@ Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom
 
 
 	}
-	print_line("NO LOADER?");
 
 	if (!p_custom)
 		memdelete(f);
diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp
index 5b767212f56..790903eff50 100644
--- a/core/math/geometry.cpp
+++ b/core/math/geometry.cpp
@@ -629,7 +629,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 
 
 	// create and initialize cells to zero
-	print_line("Wrapper: Initializing Cells");
+	//print_line("Wrapper: Initializing Cells");
 
 	uint8_t ***cell_status=memnew_arr(uint8_t**,div_x);
 	for(int i=0;i<div_x;i++) {
@@ -648,7 +648,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 	}
 
 	// plot faces into cells
-	print_line("Wrapper (1/6): Plotting Faces");
+	//print_line("Wrapper (1/6): Plotting Faces");
 
 	for (int i=0;i<face_count;i++) {
 
@@ -663,7 +663,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 
 	// determine which cells connect to the outside by traversing the outside and recursively flood-fill marking
 
-	print_line("Wrapper (2/6) Flood Filling");
+	//print_line("Wrapper (2/6): Flood Filling");
 
 	for (int i=0;i<div_x;i++) {
 
@@ -694,7 +694,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 
 	// build faces for the inside-outside cell divisors
 
-	print_line("Wrapper (3/6): Building Faces");
+	//print_line("Wrapper (3/6): Building Faces");
 
 	DVector<Face3> wrapped_faces;
 
@@ -709,7 +709,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 		}
 	}
 
-	print_line("Wrapper (4/6): Transforming Back Vertices");
+	//print_line("Wrapper (4/6): Transforming Back Vertices");
 
 	// transform face vertices to global coords
 
@@ -728,7 +728,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 	}
 
 	// clean up grid
-	print_line("Wrapper (5/6): Grid Cleanup");
+	//print_line("Wrapper (5/6): Grid Cleanup");
 
 	for(int i=0;i<div_x;i++) {
 
@@ -744,7 +744,7 @@ DVector< Face3 > Geometry::wrap_geometry( DVector< Face3 > p_array,float *p_erro
 	if (p_error)
 		*p_error=voxelsize.length();
 
-	print_line("Wrapper (6/6): Finished.");
+	//print_line("Wrapper (6/6): Finished.");
 	return wrapped_faces;
 }
 
diff --git a/core/object_type_db.cpp b/core/object_type_db.cpp
index 5f97df39a61..4998263961c 100644
--- a/core/object_type_db.cpp
+++ b/core/object_type_db.cpp
@@ -828,7 +828,7 @@ MethodBind* ObjectTypeDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind , c
 
 	TypeInfo *type=types.getptr(instance_type);
 	if (!type) {
-		print_line("couldn't bind method "+mdname+" for instance: "+instance_type);
+		ERR_PRINTS("Couldn't bind method '"+mdname+"' for instance: "+instance_type);
 		memdelete(p_bind);
 		ERR_FAIL_COND_V(!type,NULL);
 	}
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index cb7cefea264..582b9e24904 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -657,7 +657,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess
 				da->change_dir("..");
 			}
 		} else {
-			ERR_PRINTS(TTR("Cannot go into subdir:")+" "+E->get());
+			ERR_PRINTS("Cannot go into subdir: "+E->get());
 		}
 
 		p_progress.update(idx,total);
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index 2c3ed2afd6a..da608292c18 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -496,7 +496,6 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
 					}
 
 					int vtx = face[idx][0].to_int()-1;
-					print_line("vtx: "+itos(vtx)+"/"+itos(vertices.size()));
 					ERR_FAIL_INDEX_V(vtx,vertices.size(),ERR_PARSE_ERROR);
 
 					Vector3 vertex = vertices[vtx];