Begining of GLES3 renderer:

-Most 2D drawing is implemented
-Missing shaders
-Missing all 3D
-Editor needs to be set on update always to be used, otherwise it does not refresh
-Large parts of editor not working

6 files changed, 96 insertions, 99 deletions

diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp
index df3741f0d..0a3b0d491 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -1330,7 +1330,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 			if (err==OK) {
 
 				for(int i=0;i<height;i++){
-					color[i]=img.get_pixel(0,i*img.get_height()/height);
+					//color[i]=img.get_pixel(0,i*img.get_height()/height);
 				}
 			} else {
 
@@ -1514,7 +1514,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 
 		w=DVector<uint8_t>::Write();
 
-		Image img(s.width,s.height,0,Image::FORMAT_RGBA,pixels);
+		Image img(s.width,s.height,0,Image::FORMAT_RGBA8,pixels);
 
 		font_data_list[i]->blit=img;
 		font_data_list[i]->blit_ofs=o;
@@ -1537,7 +1537,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 	res_size.y=nearest_power_of_2(res_size.y);
 	print_line("Atlas size: "+res_size);
 
-	Image atlas(res_size.x,res_size.y,0,Image::FORMAT_RGBA);
+	Image atlas(res_size.x,res_size.y,0,Image::FORMAT_RGBA8);
 
 	for(int i=0;i<font_data_list.size();i++) {
 
@@ -1565,12 +1565,12 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 			}
 		}
 
-		atlas=Image(res_size.x,res_size.y,0,Image::FORMAT_RGBA,data);
+		atlas=Image(res_size.x,res_size.y,0,Image::FORMAT_RGBA8,data);
 	}
 
 	if (from->has_option("color/monochrome") && bool(from->get_option("color/monochrome"))) {
 
-		atlas.convert(Image::FORMAT_GRAYSCALE_ALPHA);
+		atlas.convert(Image::FORMAT_LA8);
 	}
 
 
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index 1130e2be3..6b1873d49 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -237,8 +237,8 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Spatial *p_parent) {
 					//well, it's an ambient light..
 					Light *l = memnew( DirectionalLight );
 //					l->set_color(Light::COLOR_AMBIENT,ld.color);
-					l->set_color(Light::COLOR_DIFFUSE,Color(0,0,0));
-					l->set_color(Light::COLOR_SPECULAR,Color(0,0,0));
+//					l->set_color(Light::COLOR_DIFFUSE,Color(0,0,0));
+//					l->set_color(Light::COLOR_SPECULAR,Color(0,0,0));
 					node = l;
 
 				} else if (ld.mode==Collada::LightData::MODE_DIRECTIONAL) {
@@ -248,8 +248,8 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Spatial *p_parent) {
 					//if (found_ambient) //use it here
 					//	l->set_color(Light::COLOR_AMBIENT,ambient);
 
-					l->set_color(Light::COLOR_DIFFUSE,ld.color);
-					l->set_color(Light::COLOR_SPECULAR,Color(1,1,1));
+//					l->set_color(Light::COLOR_DIFFUSE,ld.color);
+//					l->set_color(Light::COLOR_SPECULAR,Color(1,1,1));
 					node = l;
 				} else {
 
@@ -259,14 +259,14 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Spatial *p_parent) {
 						l=memnew( OmniLight );
 					else {
 						l=memnew( SpotLight );
-						l->set_parameter(Light::PARAM_SPOT_ANGLE,ld.spot_angle);
-						l->set_parameter(Light::PARAM_SPOT_ATTENUATION,ld.spot_exp);
+//						l->set_parameter(Light::PARAM_SPOT_ANGLE,ld.spot_angle);
+//						l->set_parameter(Light::PARAM_SPOT_ATTENUATION,ld.spot_exp);
 					}
 
 					//
-					l->set_color(Light::COLOR_DIFFUSE,ld.color);
-					l->set_color(Light::COLOR_SPECULAR,Color(1,1,1));
-					l->approximate_opengl_attenuation(ld.constant_att,ld.linear_att,ld.quad_att);
+//					l->set_color(Light::COLOR_DIFFUSE,ld.color);
+//					l->set_color(Light::COLOR_SPECULAR,Color(1,1,1));
+//					l->approximate_opengl_attenuation(ld.constant_att,ld.linear_att,ld.quad_att);
 					node=l;
 				}
 
@@ -394,14 +394,14 @@ Error ColladaImport::_create_material(const String& p_target) {
 			Ref<Texture> texture = ResourceLoader::load(texfile,"Texture");
 			if (texture.is_valid()) {
 
-				material->set_texture(FixedMaterial::PARAM_DIFFUSE,texture);
-				material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,1));
+//				material->set_texture(FixedMaterial::PARAM_DIFFUSE,texture);
+//				material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,1));
 			} else {
 				missing_textures.push_back(texfile.get_file());
 			}
 		}
 	} else {
-		material->set_parameter(FixedMaterial::PARAM_DIFFUSE,effect.diffuse.color);
+//		material->set_parameter(FixedMaterial::PARAM_DIFFUSE,effect.diffuse.color);
 	}
 
 	// SPECULAR
@@ -414,15 +414,15 @@ Error ColladaImport::_create_material(const String& p_target) {
 			Ref<Texture> texture = ResourceLoader::load(texfile,"Texture");
 			if (texture.is_valid()) {
 
-				material->set_texture(FixedMaterial::PARAM_SPECULAR,texture);
-				material->set_parameter(FixedMaterial::PARAM_SPECULAR,Color(1,1,1,1));
+//				material->set_texture(FixedMaterial::PARAM_SPECULAR,texture);
+//				material->set_parameter(FixedMaterial::PARAM_SPECULAR,Color(1,1,1,1));
 			} else {
 				missing_textures.push_back(texfile.get_file());
 			}
 
 		}
 	} else {
-		material->set_parameter(FixedMaterial::PARAM_SPECULAR,effect.specular.color);
+//		material->set_parameter(FixedMaterial::PARAM_SPECULAR,effect.specular.color);
 	}
 
 	// EMISSION
@@ -435,15 +435,15 @@ Error ColladaImport::_create_material(const String& p_target) {
 			Ref<Texture> texture = ResourceLoader::load(texfile,"Texture");
 			if (texture.is_valid()) {
 
-				material->set_texture(FixedMaterial::PARAM_EMISSION,texture);
-				material->set_parameter(FixedMaterial::PARAM_EMISSION,Color(1,1,1,1));
+//				material->set_texture(FixedMaterial::PARAM_EMISSION,texture);
+//				material->set_parameter(FixedMaterial::PARAM_EMISSION,Color(1,1,1,1));
 			}else {
-				missing_textures.push_back(texfile.get_file());
+//				missing_textures.push_back(texfile.get_file());
 			}
 
 		}
 	} else {
-		material->set_parameter(FixedMaterial::PARAM_EMISSION,effect.emission.color);
+//		material->set_parameter(FixedMaterial::PARAM_EMISSION,effect.emission.color);
 	}
 
 	// NORMAL
@@ -456,18 +456,18 @@ Error ColladaImport::_create_material(const String& p_target) {
 			Ref<Texture> texture = ResourceLoader::load(texfile,"Texture");
 			if (texture.is_valid()) {
 
-				material->set_texture(FixedMaterial::PARAM_NORMAL,texture);
+	//			material->set_texture(FixedMaterial::PARAM_NORMAL,texture);
 			}else {
-				missing_textures.push_back(texfile.get_file());
+//				missing_textures.push_back(texfile.get_file());
 			}
 
 		}
 	}
 
 
-	material->set_parameter(FixedMaterial::PARAM_SPECULAR_EXP,effect.shininess);
-	material->set_flag(Material::FLAG_DOUBLE_SIDED,effect.double_sided);
-	material->set_flag(Material::FLAG_UNSHADED,effect.unshaded);
+//	material->set_parameter(FixedMaterial::PARAM_SPECULAR_EXP,effect.shininess);
+//	material->set_flag(Material::FLAG_DOUBLE_SIDED,effect.double_sided);
+//	material->set_flag(Material::FLAG_UNSHADED,effect.unshaded);
 
 
 
@@ -1196,7 +1196,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 				tarrayw = DVector<real_t>::Write();
 
 				final_tangent_array=tarray;
-			} else if (final_normal_array.size() && primitive==Mesh::PRIMITIVE_TRIANGLES && final_uv_array.size() && (force_make_tangents || (material.is_valid() && material->get_texture(FixedMaterial::PARAM_NORMAL).is_valid()))){
+			} else if (final_normal_array.size() && primitive==Mesh::PRIMITIVE_TRIANGLES && final_uv_array.size() && (force_make_tangents || (material.is_valid()))){
 				//if this uses triangles, there are uvs and the material is using a normalmap, generate tangents and binormals, because they WILL be needed
 				//generate binormals/tangents
 				_generate_tangents_and_binormals(index_array,final_vertex_array,final_uv_array,final_normal_array,final_tangent_array);
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index 190b56fab..9d68807c4 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -1406,9 +1406,9 @@ void EditorSceneImportPlugin::_find_resources(const Variant& p_var, Map<Ref<Imag
 								if (tex.is_valid()) {
 
 									image_map.insert(tex,TEXTURE_ROLE_NORMALMAP);
-									if (p_flags&SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY)
-										res->cast_to<FixedMaterial>()->set_fixed_flag(FixedMaterial::FLAG_USE_XY_NORMALMAP,true);
-								}
+									//if (p_flags&SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY)
+									//	res->cast_to<FixedMaterial>()->set_fixed_flag(FixedMaterial::FLAG_USE_XY_NORMALMAP,true);
+								}//
 
 
 							} else {
@@ -1516,10 +1516,10 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 
 					Ref<FixedMaterial> fm = m->surface_get_material(i);
 					if (fm.is_valid()) {
-						fm->set_flag(Material::FLAG_UNSHADED,true);
-						fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-						fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-						fm->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
+					//	fm->set_flag(Material::FLAG_UNSHADED,true);
+					//	fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+					//	fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+					//	fm->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
 					}
 				}
 			}
@@ -1543,17 +1543,17 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 
 				if (p_flags&SCENE_FLAG_DETECT_ALPHA && _teststr(mat->get_name(),"alpha")) {
 
-					mat->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
-					mat->set_name(_fixstr(mat->get_name(),"alpha"));
+				//	mat->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
+				//	mat->set_name(_fixstr(mat->get_name(),"alpha"));
 				}
 				if (p_flags&SCENE_FLAG_DETECT_VCOLOR && _teststr(mat->get_name(),"vcol")) {
 
-					mat->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY,true);
-					mat->set_name(_fixstr(mat->get_name(),"vcol"));
+					//mat->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY,true);
+					//mat->set_name(_fixstr(mat->get_name(),"vcol"));
 				}
 
 				if (p_flags&SCENE_FLAG_SET_LIGHTMAP_TO_UV2_IF_EXISTS && m->surface_get_format(i)&Mesh::ARRAY_FORMAT_TEX_UV2) {
-					mat->set_flag(Material::FLAG_LIGHTMAP_ON_UV2,true);
+					//mat->set_flag(Material::FLAG_LIGHTMAP_ON_UV2,true);
 				}
 
 			}
@@ -1612,11 +1612,11 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 					float dist = d.to_double();
 					mi->set_flag(GeometryInstance::FLAG_BILLBOARD,true);
 					mi->set_flag(GeometryInstance::FLAG_BILLBOARD_FIX_Y,true);
-					mi->set_draw_range_begin(dist);
-					mi->set_draw_range_end(100000);
+					//mi->set_draw_range_begin(dist);
+					//mi->set_draw_range_end(100000);
 
-					mip->set_draw_range_begin(0);
-					mip->set_draw_range_end(dist);
+					//mip->set_draw_range_begin(0);
+					//mip->set_draw_range_end(dist);
 
 					if (mi->get_mesh().is_valid()) {
 
@@ -1625,10 +1625,10 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 
 							Ref<FixedMaterial> fm = m->surface_get_material(i);
 							if (fm.is_valid()) {
-								fm->set_flag(Material::FLAG_UNSHADED,true);
-								fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-								fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-								fm->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
+							//	fm->set_flag(Material::FLAG_UNSHADED,true);
+							//	fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+							//	fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+							//	fm->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
 							}
 						}
 					}
@@ -1660,11 +1660,11 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 		    d=d.substr(1,d.length());
 		if (d.length() && d[0]>='0' && d[0]<='9') {
 		    float dist = d.to_double();
-		    mi->set_draw_range_begin(dist);
-		    mi->set_draw_range_end(100000);
+		  ///  mi->set_draw_range_begin(dist);
+		  //  mi->set_draw_range_end(100000);
 
-		    mip->set_draw_range_begin(0);
-		    mip->set_draw_range_end(dist);
+		  //  mip->set_draw_range_begin(0);
+		  //  mip->set_draw_range_end(dist);
 
 		    /*if (mi->get_mesh().is_valid()) {
 
@@ -1888,8 +1888,8 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 		BSP_Tree bsptree(faces);
 
 		Ref<RoomBounds> area = memnew( RoomBounds );
-		area->set_bounds(faces);
-		area->set_geometry_hint(faces);
+		//area->set_bounds(faces);
+		//area->set_geometry_hint(faces);
 
 
 		Room * room = memnew( Room );
@@ -1917,7 +1917,7 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 		memdelete(p_node);
 		p_node=room;
 
-		room->compute_room_from_subtree();
+		//room->compute_room_from_subtree();
 
 	} else if (p_flags&SCENE_FLAG_CREATE_PORTALS &&_teststr(name,"portal") && p_node->cast_to<MeshInstance>()) {
 
@@ -2047,7 +2047,7 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 				Ref<FixedMaterial> fm = mesh->surface_get_material(i);
 				if (fm.is_valid()) {
 					String name = fm->get_name();
-					if (_teststr(name,"alpha")) {
+				/*	if (_teststr(name,"alpha")) {
 						fm->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
 						name=_fixstr(name,"alpha");
 					}
@@ -2055,7 +2055,7 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>
 					if (_teststr(name,"vcol")) {
 						fm->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY,true);
 						name=_fixstr(name,"vcol");
-					}
+					}*/
 					fm->set_name(name);
 				}
 			}
diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
index ac3c4637c..f11718236 100644
--- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
+++ b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
@@ -33,7 +33,7 @@
 #include "scene/3d/mesh_instance.h"
 #include "scene/animation/animation_player.h"
 
-
+#if 0
 String EditorSceneImporterFBXConv::_id(const String& p_id) const {
 
 	return p_id.replace(":","_").replace("/","_");
@@ -1132,3 +1132,4 @@ EditorSceneImporterFBXConv::EditorSceneImporterFBXConv() {
 #endif
 
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.h b/tools/editor/io_plugins/editor_scene_importer_fbxconv.h
index b0cbc07ba..e23c0e2fa 100644
--- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.h
+++ b/tools/editor/io_plugins/editor_scene_importer_fbxconv.h
@@ -32,6 +32,7 @@
 #include "tools/editor/io_plugins/editor_scene_import_plugin.h"
 #include "scene/3d/skeleton.h"
 
+#if 0
 
 class EditorSceneImporterFBXConv : public EditorSceneImporter {
 
@@ -107,3 +108,4 @@ public:
 };
 
 #endif // EDITOR_SCENE_IMPORTER_FBXCONV_H
+#endif
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 2935ea8fe..4397956be 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -843,33 +843,27 @@ void EditorTextureImportPlugin::compress_image(EditorExportPlatform::ImageCompre
 
 			//do absolutely nothing
 
-		} break;
-		case EditorExportPlatform::IMAGE_COMPRESSION_INDEXED: {
-
-			//quantize
-			image.quantize();
-
-		} break;
+		} break;	
 		case EditorExportPlatform::IMAGE_COMPRESSION_BC: {
 
 
 			// for maximum compatibility, BC shall always use mipmaps and be PO2
 			image.resize_to_po2();
-			if (image.get_mipmaps()==0)
+			if (!image.has_mipmaps())
 				image.generate_mipmaps();
 
-			image.compress(Image::COMPRESS_BC);
+			image.compress(Image::COMPRESS_S3TC);
 			/*
 			if (has_alpha) {
 
 				if (flags&IMAGE_FLAG_ALPHA_BIT) {
-					image.convert(Image::FORMAT_BC3);
+					image.convert(Image::FORMAT_DXT5);
 				} else {
-					image.convert(Image::FORMAT_BC2);
+					image.convert(Image::FORMAT_DXT3);
 				}
 			} else {
 
-				image.convert(Image::FORMAT_BC1);
+				image.convert(Image::FORMAT_DXT1);
 			}*/
 
 
@@ -880,24 +874,24 @@ void EditorTextureImportPlugin::compress_image(EditorExportPlatform::ImageCompre
 			// for maximum compatibility (hi apple!), PVRT shall always
 			// use mipmaps, be PO2 and square
 
-			if (image.get_mipmaps()==0)
+			if (!image.has_mipmaps())
 				image.generate_mipmaps();
 			image.resize_to_po2(true);
 
 			if (p_smaller) {
 
 				image.compress(Image::COMPRESS_PVRTC2);
-				//image.convert(has_alpha ? Image::FORMAT_PVRTC2_ALPHA : Image::FORMAT_PVRTC2);
+				//image.convert(has_alpha ? Image::FORMAT_PVRTC2A : Image::FORMAT_PVRTC2);
 			} else {
 				image.compress(Image::COMPRESS_PVRTC4);
-				//image.convert(has_alpha ? Image::FORMAT_PVRTC4_ALPHA : Image::FORMAT_PVRTC4);
+				//image.convert(has_alpha ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4);
 			}
 
 		} break;
 		case EditorExportPlatform::IMAGE_COMPRESSION_ETC1: {
 
 			image.resize_to_po2(); //square or not?
-			if (image.get_mipmaps()==0)
+			if (!image.has_mipmaps())
 				image.generate_mipmaps();
 			if (!image.detect_alpha()) {
 				//ETC1 is only opaque
@@ -930,18 +924,18 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
 
 		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA) {
+		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
 
-			image.convert(Image::FORMAT_RGB);
+			image.convert(Image::FORMAT_RGB8);
 
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
 
 			image.fix_alpha_edges();
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_PREMULT_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
 
 			image.premultiply_alpha();
 		}
@@ -950,7 +944,7 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 			image.normalmap_to_xy();
 		}
 
-		//if ((image.get_format()==Image::FORMAT_RGB || image.get_format()==Image::FORMAT_RGBA) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
+		//if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
 
 		//	image.srgb_to_linear();
 		//}
@@ -989,18 +983,18 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 
 
 		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA) {
+		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
 
-			image.convert(Image::FORMAT_RGB);
+			image.convert(Image::FORMAT_RGB8);
 
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
 
 			image.fix_alpha_edges();
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_PREMULT_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
 
 			image.premultiply_alpha();
 		}
@@ -1009,7 +1003,7 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 			image.normalmap_to_xy();
 		}
 
-		//if ((image.get_format()==Image::FORMAT_RGB || image.get_format()==Image::FORMAT_RGBA) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
+		//if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
 //
 		//	print_line("CONVERT BECAUSE: "+itos(flags));
 		//	image.srgb_to_linear();
@@ -1200,9 +1194,9 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			Image src = tsources[i];
 
 			if (alpha) {
-				src.convert(Image::FORMAT_RGBA);
+				src.convert(Image::FORMAT_RGBA8);
 			} else {
-				src.convert(Image::FORMAT_RGB);
+				src.convert(Image::FORMAT_RGB8);
 			}
 
 			DVector<uint8_t> data = src.get_data();
@@ -1280,7 +1274,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			atlas_h=nearest_power_of_2(dst_size.height);
 		}
 		Image atlas;
-		atlas.create(atlas_w,atlas_h,0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
+		atlas.create(atlas_w,atlas_h,0,alpha?Image::FORMAT_RGBA8:Image::FORMAT_RGB8);
 
 
 		atlases.resize(from->get_source_count());
@@ -1411,18 +1405,18 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
 
 		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA) {
+		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
 
-			image.convert(Image::FORMAT_RGB);
+			image.convert(Image::FORMAT_RGB8);
 
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
 
 			image.fix_alpha_edges();
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_PREMULT_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
 
 			image.premultiply_alpha();
 		}
@@ -1431,7 +1425,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			image.normalmap_to_xy();
 		}
 
-		//if ((image.get_format()==Image::FORMAT_RGB || image.get_format()==Image::FORMAT_RGBA) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
+		//if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
 
 		//	image.srgb_to_linear();
 		//}
@@ -1470,18 +1464,18 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 
 		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA) {
+		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
 
-			image.convert(Image::FORMAT_RGB);
+			image.convert(Image::FORMAT_RGB8);
 
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
 
 			image.fix_alpha_edges();
 		}
 
-		if (image.get_format()==Image::FORMAT_RGBA && flags&IMAGE_FLAG_PREMULT_ALPHA) {
+		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
 
 			image.premultiply_alpha();
 		}
@@ -1490,7 +1484,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			image.normalmap_to_xy();
 		}
 
-		//if ((image.get_format()==Image::FORMAT_RGB || image.get_format()==Image::FORMAT_RGBA) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
+		//if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
 //
 		//	print_line("CONVERT BECAUSE: "+itos(flags));
 		//	image.srgb_to_linear();