Style: Fix whole-line commented code

They do not play well with clang-format which aligns the `//` part
with the rest of the code block, thus producing badly indented commented code.

31 files changed, 100 insertions, 80 deletions

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 6e7caffda9..a77385faa6 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -1978,7 +1978,7 @@ void _Directory::_bind_methods() {
 	ClassDB::bind_method(_MD("make_dir_recursive:Error","path"),&_Directory::make_dir_recursive);
 	ClassDB::bind_method(_MD("file_exists","path"),&_Directory::file_exists);
 	ClassDB::bind_method(_MD("dir_exists","path"),&_Directory::dir_exists);
-//	ClassDB::bind_method(_MD("get_modified_time","file"),&_Directory::get_modified_time);
+	//ClassDB::bind_method(_MD("get_modified_time","file"),&_Directory::get_modified_time);
 	ClassDB::bind_method(_MD("get_space_left"),&_Directory::get_space_left);
 	ClassDB::bind_method(_MD("copy:Error","from","to"),&_Directory::copy);
 	ClassDB::bind_method(_MD("rename:Error","from","to"),&_Directory::rename);
diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp
index 71f810422a..1e3a51fede 100644
--- a/core/compressed_translation.cpp
+++ b/core/compressed_translation.cpp
@@ -467,7 +467,7 @@ StringName PHashTranslation::get_message(const StringName& p_src_text) const {
 	//print_line("Hash: "+itos(p));
 
 	if (p==0xFFFFFFFF) {
-//		print_line("GETMSG: Nothing!");
+		//print_line("GETMSG: Nothing!");
 		return StringName(); //nothing
 	}
 
@@ -489,7 +489,7 @@ StringName PHashTranslation::get_message(const StringName& p_src_text) const {
 
 	//print_line("bucket pos: "+itos(idx));
 	if (idx==-1) {
-//		print_line("GETMSG: Not in Bucket!");
+		//print_line("GETMSG: Not in Bucket!");
 		return StringName();
 	}
 
@@ -497,8 +497,8 @@ StringName PHashTranslation::get_message(const StringName& p_src_text) const {
 
 		String rstr;
 		rstr.parse_utf8(&sptr[ bucket.elem[idx].str_offset ], bucket.elem[idx].uncomp_size );
-//		print_line("Uncompressed, size: "+itos(bucket.elem[idx].comp_size));
-//		print_line("Return: "+rstr);
+		//print_line("Uncompressed, size: "+itos(bucket.elem[idx].comp_size));
+		//print_line("Return: "+rstr);
 
 		return rstr;
 	} else {
@@ -508,8 +508,8 @@ StringName PHashTranslation::get_message(const StringName& p_src_text) const {
 		smaz_decompress(&sptr[ bucket.elem[idx].str_offset ], bucket.elem[idx].comp_size,uncomp.ptr(),bucket.elem[idx].uncomp_size );
 		String rstr;
 		rstr.parse_utf8(uncomp.get_data());
-//		print_line("Compressed, size: "+itos(bucket.elem[idx].comp_size));
-//		print_line("Return: "+rstr);
+		//print_line("Compressed, size: "+itos(bucket.elem[idx].comp_size));
+		//print_line("Return: "+rstr);
 		return rstr;
 	}
 
diff --git a/core/globals.cpp b/core/globals.cpp
index b89303b728..a4c24a6cc8 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -1011,7 +1011,7 @@ GlobalConfig::GlobalConfig() {
 	GLOBAL_DEF("input/ui_page_down",va);
 	input_presets.push_back("input/ui_page_down");
 
-//	GLOBAL_DEF("display/handheld/orientation", "landscape");
+	//GLOBAL_DEF("display/handheld/orientation", "landscape");
 
 
 	custom_prop_info["display/handheld/orientation"]=PropertyInfo(Variant::STRING,"display/handheld/orientation",PROPERTY_HINT_ENUM,"landscape,portrait,reverse_landscape,reverse_portrait,sensor_landscape,sensor_portrait,sensor");
diff --git a/core/hash_map.h b/core/hash_map.h
index fba12b55ec..0d55206935 100644
--- a/core/hash_map.h
+++ b/core/hash_map.h
@@ -61,7 +61,7 @@ public:
 	static _FORCE_INLINE_ uint32_t hash(const uint8_t p_int)  { return p_int; }
 	static _FORCE_INLINE_ uint32_t hash(const int8_t p_int)  { return (uint32_t)p_int; }
 	static _FORCE_INLINE_ uint32_t hash(const wchar_t p_wchar)  { return (uint32_t)p_wchar; }
-//	static _FORCE_INLINE_ uint32_t hash(const void* p_ptr)  { return uint32_t(uint64_t(p_ptr))*(0x9e3779b1L); }
+	//static _FORCE_INLINE_ uint32_t hash(const void* p_ptr)  { return uint32_t(uint64_t(p_ptr))*(0x9e3779b1L); }
 };
 
 /**
diff --git a/core/image.cpp b/core/image.cpp
index 174c840c23..d769e6a0b3 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -363,7 +363,7 @@ void Image::convert( Format p_new_format ){
 
 	Image new_img(width,height,0,p_new_format);
 
-//	int len=data.size();
+	//int len=data.size();
 
 	PoolVector<uint8_t>::Read r = data.read();
 	PoolVector<uint8_t>::Write w = new_img.data.write();
@@ -414,7 +414,7 @@ void Image::convert( Format p_new_format ){
 
 	bool gen_mipmaps=mipmaps;
 
-//	mipmaps=false;
+	//mipmaps=false;
 
 	*this=new_img;
 
@@ -1240,7 +1240,7 @@ void Image::create( const char ** p_xpm ) {
 					uint8_t col_r;
 					uint8_t col_g;
 					uint8_t col_b;
-//					uint8_t col_a=255;
+					//uint8_t col_a=255;
 
 					for (int i=0;i<6;i++) {
 
diff --git a/core/input_map.cpp b/core/input_map.cpp
index 0379131dd3..bcae630c76 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -324,7 +324,7 @@ void InputMap::load_default() {
 	key.key.scancode=KEY_PAGEDOWN;
 	action_add_event("ui_page_down",key);
 
-//	set("display/handheld/orientation", "landscape");
+	//set("display/handheld/orientation", "landscape");
 
 
 }
diff --git a/core/io/file_access_buffered_fa.h b/core/io/file_access_buffered_fa.h
index 884d40a266..000c2b45f3 100644
--- a/core/io/file_access_buffered_fa.h
+++ b/core/io/file_access_buffered_fa.h
@@ -127,10 +127,11 @@ public:
 		set_error(OK);
 	};
 
-//	static void make_default() {
-
-		//FileAccess::create_func = FileAccessBufferedFA<T>::create;
-//	};
+	/*
+	static void make_default() {
+		FileAccess::create_func = FileAccessBufferedFA<T>::create;
+	};
+	*/
 
 	virtual uint64_t _get_modified_time(const String& p_file) {
 
diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp
index a9dbf56c15..32eb003228 100644
--- a/core/io/file_access_memory.cpp
+++ b/core/io/file_access_memory.cpp
@@ -68,7 +68,7 @@ FileAccess* FileAccessMemory::create() {
 bool FileAccessMemory::file_exists(const String& p_name) {
 
 	String name = fix_path(p_name);
-//	name = DirAccess::normalize_path(name);
+	//name = DirAccess::normalize_path(name);
 
 	return files && (files->find(name) != NULL);
 }
@@ -87,7 +87,7 @@ Error FileAccessMemory::_open(const String& p_path, int p_mode_flags) {
 	ERR_FAIL_COND_V(!files, ERR_FILE_NOT_FOUND);
 
 	String name = fix_path(p_path);
-//	name = DirAccess::normalize_path(name);
+	//name = DirAccess::normalize_path(name);
 
 	Map<String, Vector<uint8_t> >::Element* E = files->find(name);
 	ERR_FAIL_COND_V(!E, ERR_FILE_NOT_FOUND);
diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp
index 19076b57be..662902281b 100644
--- a/core/io/file_access_network.cpp
+++ b/core/io/file_access_network.cpp
@@ -325,7 +325,7 @@ Error FileAccessNetwork::_open(const String& p_path, int p_mode_flags) {
 	last_page=-1;
 	last_page_buff=NULL;
 
-//	buffers.clear();
+	//buffers.clear();
 	nc->unlock_mutex();
 	DEBUG_PRINT("OPEN POST");
 	DEBUG_TIME("open_post");
@@ -437,7 +437,7 @@ int FileAccessNetwork::get_buffer(uint8_t *p_dst, int p_length) const{
 		p_length=total_size-pos;
 	}
 
-//	FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
+	//FileAccessNetworkClient *nc = FileAccessNetworkClient::singleton;
 
 	uint8_t *buff=last_page_buff;
 
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index c093b087b8..4af3503434 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -1059,7 +1059,7 @@ Ref<ResourceInteractiveLoader> ResourceFormatLoaderBinary::load_interactive(cons
 	Ref<ResourceInteractiveLoaderBinary> ria = memnew( ResourceInteractiveLoaderBinary );
 	ria->local_path=GlobalConfig::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
-//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+	//ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
 	ria->open(f);
 
 
@@ -1114,7 +1114,7 @@ Error ResourceFormatLoaderBinary::load_import_metadata(const String &p_path, Ref
 	Ref<ResourceInteractiveLoaderBinary> ria = memnew( ResourceInteractiveLoaderBinary );
 	ria->local_path=GlobalConfig::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
-//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+	//ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
 	ria->recognize(f);
 	if(ria->error!=OK)
 		return ERR_FILE_UNRECOGNIZED;
@@ -1159,14 +1159,14 @@ void ResourceFormatLoaderBinary::get_dependencies(const String& p_path,List<Stri
 	Ref<ResourceInteractiveLoaderBinary> ria = memnew( ResourceInteractiveLoaderBinary );
 	ria->local_path=GlobalConfig::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
-//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+	//ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
 	ria->get_dependencies(f,p_dependencies,p_add_types);
 }
 
 Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path,const Map<String,String>& p_map) {
 
 
-//	Error error=OK;
+	//Error error=OK;
 
 
 	FileAccess *f=FileAccess::open(p_path,FileAccess::READ);
@@ -1250,7 +1250,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path,const
 		ria->local_path=GlobalConfig::get_singleton()->localize_path(p_path);
 		ria->res_path=ria->local_path;
 		ria->remaps=p_map;
-	//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+		//ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
 		ria->open(f);
 
 		err = ria->poll();
@@ -1384,7 +1384,7 @@ String ResourceFormatLoaderBinary::get_resource_type(const String &p_path) const
 	Ref<ResourceInteractiveLoaderBinary> ria = memnew( ResourceInteractiveLoaderBinary );
 	ria->local_path=GlobalConfig::get_singleton()->localize_path(p_path);
 	ria->res_path=ria->local_path;
-//	ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
+	//ria->set_local_path( Globals::get_singleton()->localize_path(p_path) );
 	String r = ria->recognize(f);
 	return r;
 
@@ -1708,8 +1708,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant& p_property,
 
 			for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
 
-				//if (!_check_type(dict[E->get()]))
-				//	continue;
+				/*
+				if (!_check_type(dict[E->get()]))
+					continue;
+				*/
 
 				write_variant(E->get());
 				write_variant(d[E->get()]);
@@ -2150,7 +2152,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path,const RES& p_
 	}
 
 	Vector<uint64_t> ofs_table;
-//	int saved_idx=0;
+	//int saved_idx=0;
 	//now actually save the resources
 
 	for(List<ResourceData>::Element *E=resources.front();E;E=E->next()) {
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 777c57a6a6..354efaa83f 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -391,8 +391,10 @@ void ResourceLoader::get_dependencies(const String& p_path, List<String> *p_depe
 
 		if (!loader[i]->recognize(extension))
 			continue;
-		//if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
-		//	continue;
+		/*
+		if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
+			continue;
+		*/
 
 		loader[i]->get_dependencies(remapped_path,p_dependencies,p_add_types);
 
@@ -416,8 +418,10 @@ Error ResourceLoader::rename_dependencies(const String &p_path,const Map<String,
 
 		if (!loader[i]->recognize(extension))
 			continue;
-		//if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
-		//	continue;
+		/*
+		if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint))
+			continue;
+		*/
 
 		return loader[i]->rename_dependencies(p_path,p_map);
 
diff --git a/core/io/zip.c b/core/io/zip.c
index 44c79195d9..27a3d3cdc1 100644
--- a/core/io/zip.c
+++ b/core/io/zip.c
@@ -855,7 +855,7 @@ extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* gl
     ziinit.z_filefunc.zseek32_file = NULL;
     ziinit.z_filefunc.ztell32_file = NULL;
     if (pzlib_filefunc64_32_def==NULL) {
-//	fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+	//fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
     } else
         ziinit.z_filefunc = *pzlib_filefunc64_32_def;
 
diff --git a/core/map.h b/core/map.h
index af35fec332..9448389169 100644
--- a/core/map.h
+++ b/core/map.h
@@ -149,7 +149,7 @@ private:
 #ifdef GLOBALNIL_DISABLED
 			memdelete_allocator<Element,A>(_nil);
 #endif
-//			memdelete_allocator<Element,A>(_root);
+			//memdelete_allocator<Element,A>(_root);
 		}
 	};
 
diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp
index b888b6b56c..e2526f5134 100644
--- a/core/math/bsp_tree.cpp
+++ b/core/math/bsp_tree.cpp
@@ -390,8 +390,10 @@ static int _bsp_create_node(const Face3 *p_faces,const Vector<int>& p_indices,Ve
 
 		const Face3& f=p_faces[ indices[i] ];
 
-		//if (f.get_plane().is_almost_like(divisor_plane))
-		//	continue;
+		/*
+		if (f.get_plane().is_almost_like(divisor_plane))
+			continue;
+		*/
 
 		int over_count=0;
 		int under_count=0;
@@ -546,7 +548,7 @@ BSP_Tree::BSP_Tree(const Variant& p_variant) {
 	error_radius = d["error"];
 	aabb = d["aabb"];
 
-//	int node_count = src_nodes.size();
+	//int node_count = src_nodes.size();
 	nodes.resize(src_nodes.size()/3);
 
 	PoolVector<int>::Read r = src_nodes.read();
diff --git a/core/math/geometry.h b/core/math/geometry.h
index 9800e5513c..d5b3a3068c 100644
--- a/core/math/geometry.h
+++ b/core/math/geometry.h
@@ -750,9 +750,7 @@ public:
 			return Vector<Vector3>(); //empty
 		}
 
-//		long count = 0;
 		long previous = polygon.size() - 1;
-
 		Vector<Vector3> clipped;
 
 		for (int index = 0; index < polygon.size(); index++) {
diff --git a/core/math/octree.h b/core/math/octree.h
index 1a41413a76..483ba1d510 100644
--- a/core/math/octree.h
+++ b/core/math/octree.h
@@ -130,8 +130,10 @@ private:
 
 		~Octant() {
 
-			//for (int i=0;i<8;i++)
-			//	memdelete_notnull(children[i]);
+			/*
+			for (int i=0;i<8;i++)
+				memdelete_notnull(children[i]);
+			*/
 		}
 	};
 
@@ -250,8 +252,10 @@ private:
 			E->get().eA=p_A->pair_list.push_back(&E->get());
 			E->get().eB=p_B->pair_list.push_back(&E->get());
 
-//			if (pair_callback)
-//				pair_callback(pair_callback_userdata,p_A->userdata,p_B->userdata);
+			/*
+			if (pair_callback)
+				pair_callback(pair_callback_userdata,p_A->userdata,p_B->userdata);
+			*/
 		} else {
 
 			E->get().refcount++;
@@ -970,8 +974,10 @@ void Octree<T,use_pairs,AL>::move(OctreeElementID p_id, const Rect3& p_aabb) {
 		Octant *o=E->get().octant;
 		typename List<typename Element::OctantOwner,AL>::Element *N=E->next();
 
-//		if (!use_pairs)
-//			o->elements.erase( E->get().E );
+		/*
+		if (!use_pairs)
+			o->elements.erase( E->get().E );
+		*/
 
 		if (use_pairs && e.pairable)
 			o->pairable_elements.erase( E->get().E );
diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp
index ab81a068d4..756e48d0b4 100644
--- a/core/math/quick_hull.cpp
+++ b/core/math/quick_hull.cpp
@@ -483,7 +483,7 @@ Error QuickHull::build(const Vector<Vector3>& p_points, Geometry::MeshData &r_me
 	//fill mesh
 	r_mesh.faces.clear();
 	r_mesh.faces.resize(ret_faces.size());
-//	print_line("FACECOUNT: "+itos(r_mesh.faces.size()));
+	//print_line("FACECOUNT: "+itos(r_mesh.faces.size()));
 
 	int idx=0;
 	for (List<Geometry::MeshData::Face>::Element *E=ret_faces.front();E;E=E->next()) {
diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
index fc5f55066b..74c4656771 100644
--- a/core/math/triangle_mesh.cpp
+++ b/core/math/triangle_mesh.cpp
@@ -320,7 +320,7 @@ bool TriangleMesh::intersect_segment(const Vector3& p_begin,const Vector3& p_end
 
 
 				bool valid = b.aabb.intersects_segment(p_begin,p_end);
-//				bool valid = b.aabb.intersects(ray_aabb);
+				//bool valid = b.aabb.intersects(ray_aabb);
 
 				if (!valid) {
 
diff --git a/core/math/triangulator.cpp b/core/math/triangulator.cpp
index 8f82d76823..75b2b064c4 100644
--- a/core/math/triangulator.cpp
+++ b/core/math/triangulator.cpp
@@ -1128,7 +1128,7 @@ int TriangulatorPartition::MonotonePartition(List<TriangulatorPoly> *inpolys, Li
 	//this makes deleting existing edges much faster
 	Set<ScanLineEdge>::Element **edgeTreeIterators,*edgeIter;
 	edgeTreeIterators = new Set<ScanLineEdge>::Element*[maxnumvertices];
-//	Pair<Set<ScanLineEdge>::Element*,bool> edgeTreeRet;
+	//Pair<Set<ScanLineEdge>::Element*,bool> edgeTreeRet;
 	for(i = 0; i<numvertices; i++) edgeTreeIterators[i] = NULL;
 
 	//for each vertex
diff --git a/core/object.cpp b/core/object.cpp
index 3bb917bd38..8af088122e 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -369,8 +369,10 @@ void Object::set(const String& p_name, const Variant& p_value) {
 
 	_setv(p_name,p_value);
 
-	//if (!_use_builtin_script())
-//		return;
+	/*
+	if (!_use_builtin_script())
+		return;
+	*/
 
 	bool success;
 	ClassDB::set_property(this,p_name,p_value,success);
@@ -410,8 +412,10 @@ void Object::set(const StringName& p_name, const Variant& p_value, bool *r_valid
 	//try built-in setgetter
 	{
 		if (ClassDB::set_property(this,p_name,p_value,r_valid)) {
-			//if (r_valid)
-			//	*r_valid=true;
+			/*
+			if (r_valid)
+				*r_valid=true;
+			*/
 			return;
 		}
 	}
@@ -1689,12 +1693,12 @@ void Object::_bind_methods() {
 
 	//todo reimplement this per language so all 5 arguments can be called
 
-//	ClassDB::bind_method(_MD("call","method","arg1","arg2","arg3","arg4"),&Object::_call_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()));
-//	ClassDB::bind_method(_MD("call_deferred","method","arg1","arg2","arg3","arg4"),&Object::_call_deferred_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()));
+	//ClassDB::bind_method(_MD("call","method","arg1","arg2","arg3","arg4"),&Object::_call_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()));
+	//ClassDB::bind_method(_MD("call_deferred","method","arg1","arg2","arg3","arg4"),&Object::_call_deferred_bind,DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()),DEFVAL(Variant()));
 
 	ClassDB::bind_method(_MD("add_user_signal","signal","arguments"),&Object::_add_user_signal,DEFVAL(Array()));
 	ClassDB::bind_method(_MD("has_user_signal","signal"),&Object::_has_user_signal);
-//	ClassDB::bind_method(_MD("emit_signal","signal","arguments"),&Object::_emit_signal,DEFVAL(Array()));
+	//ClassDB::bind_method(_MD("emit_signal","signal","arguments"),&Object::_emit_signal,DEFVAL(Array()));
 
 
 	{
diff --git a/core/object.h b/core/object.h
index a54693eab6..6ce579ea99 100644
--- a/core/object.h
+++ b/core/object.h
@@ -579,8 +579,8 @@ public:
 	}
 
 	/* IAPI */
-//	void set(const String& p_name, const Variant& p_value);
-//	Variant get(const String& p_name) const;
+	//void set(const String& p_name, const Variant& p_value);
+	//Variant get(const String& p_name) const;
 
 	void set(const StringName& p_name, const Variant& p_value, bool *r_valid=NULL);
 	Variant get(const StringName& p_name, bool *r_valid=NULL) const;
diff --git a/core/object_type_db.cpp b/core/object_type_db.cpp
index f3bb37421f..3139ea9511 100644
--- a/core/object_type_db.cpp
+++ b/core/object_type_db.cpp
@@ -897,7 +897,7 @@ bool ClassDB::set_property(Object* p_object,const StringName& p_property, const
 			if (psg->index>=0) {
 				Variant index=psg->index;
 				const Variant* arg[2]={&index,&p_value};
-//				p_object->call(psg->setter,arg,2,ce);
+				//p_object->call(psg->setter,arg,2,ce);
 				if (psg->_setptr) {
 					psg->_setptr->call(p_object,arg,2,ce);
 				} else {
diff --git a/core/os/memory.h b/core/os/memory.h
index 0e6dea48d3..49424037ff 100644
--- a/core/os/memory.h
+++ b/core/os/memory.h
@@ -97,8 +97,8 @@ _ALWAYS_INLINE_ T *_post_initialize(T *p_obj) {
 #define memnew(m_class) _post_initialize(new("") m_class)
 
 _ALWAYS_INLINE_ void * operator new(size_t p_size,void *p_pointer,size_t check, const char *p_description) {
-//	void *failptr=0;
-//	ERR_FAIL_COND_V( check < p_size , failptr); /** bug, or strange compiler, most likely */
+	//void *failptr=0;
+	//ERR_FAIL_COND_V( check < p_size , failptr); /** bug, or strange compiler, most likely */
 
 	return p_pointer;
 }
diff --git a/core/os/os.cpp b/core/os/os.cpp
index f4c13dabcc..3a8e15a692 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -166,7 +166,7 @@ const char *OS::get_last_error() const {
 
 void OS::dump_memory_to_file(const char* p_file) {
 
-//	Memory::dump_static_mem_to_file(p_file);
+	//Memory::dump_static_mem_to_file(p_file);
 }
 
 static FileAccess *_OSPRF=NULL;
diff --git a/core/path_remap.cpp b/core/path_remap.cpp
index fd5b38fa79..42383e212d 100644
--- a/core/path_remap.cpp
+++ b/core/path_remap.cpp
@@ -142,7 +142,7 @@ void PathRemap::load_remaps() {
 
 	// platform remaps second, so override
 	remaps = GlobalConfig::get_singleton()->get("remap/"+OS::get_singleton()->get_name());
-//	remaps = Globals::get_singleton()->get("remap/PSP");
+	//remaps = Globals::get_singleton()->get("remap/PSP");
 	{
 		int rlen = remaps.size();
 
@@ -152,7 +152,7 @@ void PathRemap::load_remaps() {
 
 			String from = r[i*2+0];
 			String to = r[i*2+1];
-//			print_line("add remap: "+from+" -> "+to);
+			//print_line("add remap: "+from+" -> "+to);
 			add_remap(from,to);
 		}
 	}
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index d97323a95e..85fa5d27c0 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -123,7 +123,7 @@ void register_core_types() {
 	ClassDB::register_virtual_class<PacketPeer>();
 	ClassDB::register_class<PacketPeerStream>();
 	ClassDB::register_class<MainLoop>();
-//	ClassDB::register_type<OptimizedSaver>();
+	//ClassDB::register_type<OptimizedSaver>();
 	ClassDB::register_class<Translation>();
 	ClassDB::register_class<PHashTranslation>();
 	ClassDB::register_class<UndoRedo>();
diff --git a/core/resource.cpp b/core/resource.cpp
index db4d2ec0db..3369e4a5a2 100644
--- a/core/resource.cpp
+++ b/core/resource.cpp
@@ -522,11 +522,12 @@ void ResourceCache::clear() {
 
 void ResourceCache::reload_externals() {
 
-	//const String *K=NULL;
-	//while ((K=resources.next(K))) {
-//		resources[*K]->reload_external_data();
-//	}
-
+	/*
+	const String *K=NULL;
+	while ((K=resources.next(K))) {
+		resources[*K]->reload_external_data();
+	}
+	*/
 }
 
 bool ResourceCache::has(const String& p_path) {
diff --git a/core/set.h b/core/set.h
index 9da2887671..13c2b3a4f6 100644
--- a/core/set.h
+++ b/core/set.h
@@ -141,7 +141,7 @@ private:
 #ifdef GLOBALNIL_DISABLED
 			memdelete_allocator<Element,A>(_nil);
 #endif
-//			memdelete_allocator<Element,A>(_root);
+			//memdelete_allocator<Element,A>(_root);
 		}
 	};
 
@@ -307,7 +307,7 @@ private:
 		new_node->right=_data._nil;
 		new_node->left=_data._nil;
 		new_node->value=p_value;
-//		new_node->data=_data;
+		//new_node->data=_data;
 		if (new_parent==_data._root || less(p_value,new_parent->value)) {
 
 			new_parent->left=new_node;
diff --git a/core/ustring.cpp b/core/ustring.cpp
index cce355afd5..9dec7895c1 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -560,7 +560,7 @@ String String::get_slice(String p_splitter, int p_slice) const {
 
 	int pos=0;
 	int prev_pos=0;
-//	int slices=1;
+	//int slices=1;
 	if (p_slice<0)
 		return "";
 	if (find(p_splitter)==-1)
@@ -574,7 +574,7 @@ String String::get_slice(String p_splitter, int p_slice) const {
 			pos=length(); //reached end
 
 		int from=prev_pos;
-	//	int to=pos;
+		//int to=pos;
 
 		if (p_slice==i) {
 
@@ -1420,7 +1420,7 @@ bool String::parse_utf8(const char* p_utf8,int p_len) {
 			}
 		}
 
-//		printf("char %i, len %i\n",unichar,len);
+		//printf("char %i, len %i\n",unichar,len);
 		if (sizeof(wchar_t)==2 && unichar>0xFFFF) {
 			unichar=' '; //too long for windows
 
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index f51abe7289..1ddb8dbf88 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -146,7 +146,7 @@ struct _VariantCall {
 		Arg(Variant::Type p_type,const StringName &p_name) { name=p_name; type=p_type; }
 	};
 
-//	void addfunc(Variant::Type p_type, const StringName& p_name,VariantFunc p_func);
+	//void addfunc(Variant::Type p_type, const StringName& p_name,VariantFunc p_func);
 
 	static void make_func_return_variant(Variant::Type p_type,const StringName& p_name) {
 
@@ -354,7 +354,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_LOCALMEM1R(Vector2,slide);
 	VCALL_LOCALMEM1R(Vector2,reflect);
 	VCALL_LOCALMEM0R(Vector2,angle);
-//	VCALL_LOCALMEM1R(Vector2,cross);
+	//VCALL_LOCALMEM1R(Vector2,cross);
 	VCALL_LOCALMEM0R(Vector2,abs);
 	VCALL_LOCALMEM1R(Vector2,clamped);
 
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index 402c8d41da..ca748b7fd3 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -2094,8 +2094,10 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
 			p_store_string_func(p_store_string_ud,"{ ");
 			for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
 
-				//if (!_check_type(dict[E->get()]))
-				//	continue;
+				/*
+				if (!_check_type(dict[E->get()]))
+					continue;
+				*/
 				write(E->get(),p_store_string_func,p_store_string_ud,p_encode_res_func,p_encode_res_ud);
 				p_store_string_func(p_store_string_ud,":");
 				write(dict[E->get()],p_store_string_func,p_store_string_ud,p_encode_res_func,p_encode_res_ud);