[Bf-blender-cvs] [b4db5a93bcf] temp-legacy-mesh-format-option: Merge branch 'master' into temp-legacy-mesh-format-option

[Hans Goudey]

Commit: b4db5a93bcf92b731d0e358602816cce2dbbd7cb
Author: Hans Goudey
Date:   Fri Jul 8 10:28:21 2022 -0500
Branches: temp-legacy-mesh-format-option
https://developer.blender.org/rBb4db5a93bcf92b731d0e358602816cce2dbbd7cb

Merge branch 'master' into temp-legacy-mesh-format-option

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_files.c
index 9bee5841d0a,a4d5bed21da..b796176fb3a
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -3065,8 -3063,7 +3065,9 @@@ static int wm_save_as_mainfile_exec(bCo
    Main *bmain = CTX_data_main(C);
    char path[FILE_MAX];
    const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke);
-   const bool use_save_as_copy = RNA_boolean_get(op->ptr, "copy");
-   const bool use_legacy_mesh_format = RNA_boolean_get(op->ptr, "use_legacy_mesh_format");
+   const bool use_save_as_copy = is_save_as && RNA_boolean_get(op->ptr, "copy");
++  const bool use_legacy_mesh_format = is_save_as &&
++                                      RNA_boolean_get(op->ptr, "use_legacy_mesh_format");
  
    /* We could expose all options to the users however in most cases remapping
     * existing relative paths is a good default.