Просмотр исходного кода

Fixed Typo: 'Seperate' to 'Separate'

Indah Sylvia 7 лет назад
Родитель
Сommit
13b630eb0c

+ 1 - 1
core/math/camera_matrix.cpp

@@ -577,7 +577,7 @@ real_t CameraMatrix::get_fov() const {
 	if ((matrix[8] == 0) && (matrix[9] == 0)) {
 		return Math::rad2deg(Math::acos(Math::abs(right_plane.normal.x))) * 2.0;
 	} else {
-		// our frustum is asymetrical need to calculate the left planes angle seperately..
+		// our frustum is asymmetrical need to calculate the left planes angle separately..
 		Plane left_plane = Plane(matrix[3] + matrix[0],
 				matrix[7] + matrix[4],
 				matrix[11] + matrix[8],

+ 7 - 7
editor/import/resource_importer_scene.cpp

@@ -120,13 +120,13 @@ String ResourceImporterScene::get_preset_name(int p_idx) const {
 
 	switch (p_idx) {
 		case PRESET_SINGLE_SCENE: return TTR("Import as Single Scene");
-		case PRESET_SEPERATE_ANIMATIONS: return TTR("Import with Seperate Animations");
+		case PRESET_SEPARATE_ANIMATIONS: return TTR("Import with Separate Animations");
 		case PRESET_SEPARATE_MATERIALS: return TTR("Import with Separate Materials");
 		case PRESET_SEPARATE_MESHES: return TTR("Import with Separate Objects");
 		case PRESET_SEPARATE_MESHES_AND_MATERIALS: return TTR("Import with Separate Objects+Materials");
-		case PRESET_SEPARATE_MESHES_AND_ANIMATIONS: return TTR("Import with Seperate Objects+Animations");
-		case PRESET_SEPERATE_MATERIALS_AND_ANIMATIONS: return TTR("Import with Seperate Materials+Animations");
-		case PRESET_SEPERATE_MESHES_MATERIALS_AND_ANIMATIONS: return TTR("Import with Seperate Objects+Materials+Animations");
+		case PRESET_SEPARATE_MESHES_AND_ANIMATIONS: return TTR("Import with Separate Objects+Animations");
+		case PRESET_SEPARATE_MATERIALS_AND_ANIMATIONS: return TTR("Import with Separate Materials+Animations");
+		case PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS: return TTR("Import with Separate Objects+Materials+Animations");
 		case PRESET_MULTIPLE_SCENES: return TTR("Import as Multiple Scenes");
 		case PRESET_MULTIPLE_SCENES_AND_MATERIALS: return TTR("Import as Multiple Scenes+Materials");
 	}
@@ -954,10 +954,10 @@ void ResourceImporterScene::get_import_options(List<ImportOption> *r_options, in
 		script_ext_hint += "*." + E->get();
 	}
 
-	bool materials_out = p_preset == PRESET_SEPARATE_MATERIALS || p_preset == PRESET_SEPARATE_MESHES_AND_MATERIALS || p_preset == PRESET_MULTIPLE_SCENES_AND_MATERIALS || p_preset == PRESET_SEPERATE_MATERIALS_AND_ANIMATIONS || p_preset == PRESET_SEPERATE_MESHES_MATERIALS_AND_ANIMATIONS;
-	bool meshes_out = p_preset == PRESET_SEPARATE_MESHES || p_preset == PRESET_SEPARATE_MESHES_AND_MATERIALS || PRESET_SEPARATE_MESHES_AND_ANIMATIONS || PRESET_SEPERATE_MESHES_MATERIALS_AND_ANIMATIONS;
+	bool materials_out = p_preset == PRESET_SEPARATE_MATERIALS || p_preset == PRESET_SEPARATE_MESHES_AND_MATERIALS || p_preset == PRESET_MULTIPLE_SCENES_AND_MATERIALS || p_preset == PRESET_SEPARATE_MATERIALS_AND_ANIMATIONS || p_preset == PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS;
+	bool meshes_out = p_preset == PRESET_SEPARATE_MESHES || p_preset == PRESET_SEPARATE_MESHES_AND_MATERIALS || PRESET_SEPARATE_MESHES_AND_ANIMATIONS || PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS;
 	bool scenes_out = p_preset == PRESET_MULTIPLE_SCENES || p_preset == PRESET_MULTIPLE_SCENES_AND_MATERIALS;
-	bool animations_out = p_preset == PRESET_SEPERATE_ANIMATIONS || PRESET_SEPARATE_MESHES_AND_ANIMATIONS || p_preset == PRESET_SEPERATE_MATERIALS_AND_ANIMATIONS || p_preset == PRESET_SEPERATE_MESHES_MATERIALS_AND_ANIMATIONS;
+	bool animations_out = p_preset == PRESET_SEPARATE_ANIMATIONS || PRESET_SEPARATE_MESHES_AND_ANIMATIONS || p_preset == PRESET_SEPARATE_MATERIALS_AND_ANIMATIONS || p_preset == PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS;
 
 	r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/custom_script", PROPERTY_HINT_FILE, script_ext_hint), ""));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "nodes/storage", PROPERTY_HINT_ENUM, "Single Scene,Instanced Sub-Scenes"), scenes_out ? 1 : 0));

+ 3 - 3
editor/import/resource_importer_scene.h

@@ -85,14 +85,14 @@ class ResourceImporterScene : public ResourceImporter {
 	enum Presets {
 		PRESET_SEPARATE_MATERIALS,
 		PRESET_SEPARATE_MESHES,
-		PRESET_SEPERATE_ANIMATIONS,
+		PRESET_SEPARATE_ANIMATIONS,
 
 		PRESET_SINGLE_SCENE,
 
 		PRESET_SEPARATE_MESHES_AND_MATERIALS,
 		PRESET_SEPARATE_MESHES_AND_ANIMATIONS,
-		PRESET_SEPERATE_MATERIALS_AND_ANIMATIONS,
-		PRESET_SEPERATE_MESHES_MATERIALS_AND_ANIMATIONS,
+		PRESET_SEPARATE_MATERIALS_AND_ANIMATIONS,
+		PRESET_SEPARATE_MESHES_MATERIALS_AND_ANIMATIONS,
 
 		PRESET_MULTIPLE_SCENES,
 		PRESET_MULTIPLE_SCENES_AND_MATERIALS,