[Bf-blender-cvs] [b3b5d4cabb9] master: Merge branch 'blender-v3.2-release'
Bastien Montagne
noreply at git.blender.org
Tue May 17 17:34:58 CEST 2022
Commit: b3b5d4cabb9653b9e5ddb9650378da4dc4aaac20
Author: Bastien Montagne
Date: Tue May 17 17:34:51 2022 +0200
Branches: master
https://developer.blender.org/rBb3b5d4cabb9653b9e5ddb9650378da4dc4aaac20
Merge branch 'blender-v3.2-release'
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/writefile.c
index 080ec50e0fb,22db54d7609..65c42545a77
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1417,9 -1415,11 +1423,11 @@@ bool BLO_write_file(Main *mainvar
BKE_bpath_absolute_convert(mainvar, dir_src, NULL);
break;
case BLO_WRITE_PATH_REMAP_NONE:
- BLI_assert(0); /* Unreachable. */
+ BLI_assert_unreachable(); /* Unreachable. */
break;
}
+
+ STRNCPY(mainvar->filepath, mainvar_filepath_orig);
}
}
More information about the Bf-blender-cvs
mailing list