Browse Source

Merge pull request #11682 from ISylvox/texure-to-texture-2.1

[2.1] Fix Typo: 'Texure' to 'Texture'
Gilles Roudiere 8 years ago
parent
commit
2b06237235

+ 1 - 1
doc/base/classes.xml

@@ -16218,7 +16218,7 @@
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-				Load an [ImageTexure].
+				Load an [ImageTexture].
 			</description>
 		</method>
 		<method name="normal_to_xy">

+ 1 - 1
editor/io_plugins/editor_font_import_plugin.cpp

@@ -1532,7 +1532,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 	font->set_ascent(ascent + top_space);
 	font->set_distance_field_hint(font_mode == _EditorFontImportOptions::FONT_DISTANCE_FIELD);
 
-	//register texures
+	//register textures
 	{
 		Ref<ImageTexture> t = memnew(ImageTexture);
 		int flags;

+ 1 - 1
main/performance.cpp

@@ -94,7 +94,7 @@ String Performance::get_monitor_name(Monitor p_monitor) const {
 		"raster/surface_changes",
 		"raster/draw_calls",
 		"video/video_mem",
-		"video/texure_mem",
+		"video/texture_mem",
 		"video/vertex_mem",
 		"video/video_mem_max",
 		"physics_2d/active_objects",

+ 1 - 1
scene/3d/immediate_geometry.h

@@ -38,7 +38,7 @@ class ImmediateGeometry : public GeometryInstance {
 	OBJ_TYPE(ImmediateGeometry, GeometryInstance);
 
 	RID im;
-	//a list of texures drawn need to be kept, to avoid references
+	//a list of textures drawn need to be kept, to avoid references
 	// in VisualServer from becoming invalid if the texture is no longer used
 	List<Ref<Texture> > cached_textures;
 	bool empty;

+ 1 - 1
servers/visual_server.h

@@ -97,7 +97,7 @@ public:
 	enum TextureFlags {
 		TEXTURE_FLAG_MIPMAPS = 1, /// Enable automatic mipmap generation - when available
 		TEXTURE_FLAG_REPEAT = 2, /// Repeat texture (Tiling), otherwise Clamping
-		TEXTURE_FLAG_FILTER = 4, /// Create texure with linear (or available) filter
+		TEXTURE_FLAG_FILTER = 4, /// Create texture with linear (or available) filter
 		TEXTURE_FLAG_ANISOTROPIC_FILTER = 8,
 		TEXTURE_FLAG_CONVERT_TO_LINEAR = 16,
 		TEXTURE_FLAG_MIRRORED_REPEAT = 32, /// Repeat texture, with alternate sections mirrored