Merge branch 'master' into blender2.8

3 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c
index 4440b99f211..91fc1e9fe6a 100644
--- a/source/blender/editors/io/io_alembic.c
+++ b/source/blender/editors/io/io_alembic.c
@@ -86,7 +86,7 @@ static int wm_alembic_export_invoke(bContext *C, wmOperator *op, const wmEvent *
 			BLI_strncpy(filepath, BKE_main_blendfile_path(bmain), sizeof(filepath));
 		}
 
-		BLI_replace_extension(filepath, sizeof(filepath), ".abc");
+		BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
 		RNA_string_set(op->ptr, "filepath", filepath);
 	}
 
@@ -284,8 +284,8 @@ static bool wm_alembic_export_check(bContext *UNUSED(C), wmOperator *op)
 	char filepath[FILE_MAX];
 	RNA_string_get(op->ptr, "filepath", filepath);
 
-	if (!BLI_testextensie(filepath, ".abc")) {
-		BLI_ensure_extension(filepath, FILE_MAX, ".abc");
+	if (!BLI_path_extension_check(filepath, ".abc")) {
+		BLI_path_extension_ensure(filepath, FILE_MAX, ".abc");
 		RNA_string_set(op->ptr, "filepath", filepath);
 		return true;
 	}
diff --git a/source/blender/editors/io/io_cache.c b/source/blender/editors/io/io_cache.c
index b13eaced843..221142a6cf8 100644
--- a/source/blender/editors/io/io_cache.c
+++ b/source/blender/editors/io/io_cache.c
@@ -61,7 +61,7 @@ static int cachefile_open_invoke(bContext *C, wmOperator *op, const wmEvent *eve
 		Main *bmain = CTX_data_main(C);
 
 		BLI_strncpy(filepath, BKE_main_blendfile_path(bmain), sizeof(filepath));
-		BLI_replace_extension(filepath, sizeof(filepath), ".abc");
+		BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
 		RNA_string_set(op->ptr, "filepath", filepath);
 	}
 
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index aca380c3123..8f05495bb7f 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -72,7 +72,7 @@ static int wm_collada_export_invoke(bContext *C, wmOperator *op, const wmEvent *
 		else
 			BLI_strncpy(filepath, blendfile_path, sizeof(filepath));
 
-		BLI_replace_extension(filepath, sizeof(filepath), ".dae");
+		BLI_path_extension_replace(filepath, sizeof(filepath), ".dae");
 		RNA_string_set(op->ptr, "filepath", filepath);
 	}
 
@@ -119,7 +119,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	}
 
 	RNA_string_get(op->ptr, "filepath", filepath);
-	BLI_ensure_extension(filepath, sizeof(filepath), ".dae");
+	BLI_path_extension_ensure(filepath, sizeof(filepath), ".dae");
 
 
 	/* Avoid File write exceptions in Collada */
@@ -337,8 +337,8 @@ static bool wm_collada_export_check(bContext *UNUSED(C), wmOperator *op)
 	char filepath[FILE_MAX];
 	RNA_string_get(op->ptr, "filepath", filepath);
 
-	if (!BLI_testextensie(filepath, ".dae")) {
-		BLI_ensure_extension(filepath, FILE_MAX, ".dae");
+	if (!BLI_path_extension_check(filepath, ".dae")) {
+		BLI_path_extension_ensure(filepath, FILE_MAX, ".dae");
 		RNA_string_set(op->ptr, "filepath", filepath);
 		return true;
 	}