diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-24 14:54:51 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-24 15:03:01 +0300 |
commit | 660f0c6a0e1fa9bf8e93e3eb6c31dee9ed919192 (patch) | |
tree | 0fe1870dcfa2a0285a1bc3af87a1c39b8db4c281 /source/blender/blenloader | |
parent | 8cb55f8d1672de4b40ce9f5a6a4803a2779d7379 (diff) |
Preferences: disable changing 'U' on blend file versioning
Would have prevented T71612
Diffstat (limited to 'source/blender/blenloader')
8 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b9ba17d1120..9c220e59017 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -159,6 +159,9 @@ #include <errno.h> +/* Make preferences read-only. */ +#define U (*((const UserDef *)&U)) + /** * READ * ==== diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index d8e4f3d97a5..3e7b1582603 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -84,6 +84,9 @@ #include <errno.h> +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + /* 2.50 patch */ static void area_add_header_region(ScrArea *sa, ListBase *lb) { diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 4e0be8ceb9c..40219a36323 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -79,6 +79,9 @@ #include "readfile.h" +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + static void do_versions_nodetree_image_default_alpha_output(bNodeTree *ntree) { bNode *node; diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 8a8a5ade476..fb570b956b6 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -81,6 +81,9 @@ #include "MEM_guardedalloc.h" +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + /* ************************************************** */ /* GP Palettes API (Deprecated) */ diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 58a9f22c4bd..8a3ec61bbc8 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -96,6 +96,9 @@ #include "MEM_guardedalloc.h" +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + static bScreen *screen_parent_find(const bScreen *screen) { /* Can avoid lookup if screen state isn't maximized/full diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 45ec6eef813..f2d6db886d3 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -56,6 +56,9 @@ #include "BLO_readfile.h" +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + /** * Rename if the ID doesn't exist. */ diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 1b30c7371a2..5d46f0735eb 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -89,6 +89,9 @@ #include <errno.h> +/* Make preferences read-only, use versioning_userdef.c. */ +#define U (*((const UserDef *)&U)) + static void vcol_to_fcol(Mesh *me) { MFace *mface; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 3390d30ad5d..b3a16b1fb4d 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -181,6 +181,9 @@ #include <errno.h> +/* Make preferences read-only. */ +#define U (*((const UserDef *)&U)) + /* ********* my write, buffered writing with minimum size chunks ************ */ /* Use optimal allocation since blocks of this size are kept in memory for undo. */ |