Merge branch 'blender-v2.93-release'

extern/smaa_areatex/smaa_areatex.cpp

@@ -1088,6 +1088,8 @@ static int generate_file(AreaOrtho *ortho, AreaDiag *diag, const char *path, boo
 		return 1;
 	}
 
+	// fprintf(stderr, "Generating %s\n", path);
+
 	if (tga)
 		write_tga(ortho, diag, fp, subsampling);
 	else if (raw)

release/scripts/modules/bpy_extras/io_utils.py

@@ -94,13 +94,11 @@ class ExportHelper:
         if check_extension is not None:
             filepath = self.filepath
             if os.path.basename(filepath):
-                filepath = bpy.path.ensure_ext(
-                    filepath,
-                    self.filename_ext
-                    if check_extension
-                    else "",
-                )
-
+                if check_extension:
+                    filepath = bpy.path.ensure_ext(
+                        os.path.splitext(filepath)[0],
+                        self.filename_ext,
+                    )
                 if filepath != self.filepath:
                     self.filepath = filepath
                     change_ext = True