Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / sound / sound_ops.c
index b7a80a92998641861bb7299bc67d5dfe953a4ccd..049feea2d8a3400d75b7ddbf4d8583119a1b662b 100644 (file)
@@ -455,10 +455,10 @@ static bool sound_mixdown_check(bContext *UNUSED(C), wmOperator *op)
                prop = RNA_struct_find_property(op->ptr, "filepath");
                RNA_property_string_get(op->ptr, prop, filepath);
 
                prop = RNA_struct_find_property(op->ptr, "filepath");
                RNA_property_string_get(op->ptr, prop, filepath);
 
-               if (BLI_testextensie_array(filepath, snd_ext_sound))
-                       check = BLI_replace_extension(filepath, FILE_MAX, extension);
+               if (BLI_path_extension_check_array(filepath, snd_ext_sound))
+                       check = BLI_path_extension_replace(filepath, FILE_MAX, extension);
                else
                else
-                       check = BLI_ensure_extension(filepath, FILE_MAX, extension);
+                       check = BLI_path_extension_ensure(filepath, FILE_MAX, extension);
 
                if (!check)
                        return check;
 
                if (!check)
                        return check;