diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-11-04 06:51:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-04 06:51:55 +0300 |
| commit | 7c188d8241e00d2fa82de88be511111189c3281d (patch) | |
| tree | dc134dd774e6d5b4840f636e698d3a92fe3a20fe /source/blender/blenloader | |
| parent | 9cd5b3c9b6c1645aabcadab9761e9c46b7ca1fca (diff) | |
| parent | 27103c56b4f520b1b9d49419d8e1a5439b2244b5 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 3c470a7d3df..9437dadc882 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -27,8 +27,6 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BLT_translation.h" - #include "DNA_anim_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" @@ -51,6 +49,16 @@ #include "wm_event_types.h" +/* Don't use translation strings in versioning! + * These depend on the preferences already being read. + * If this is important we can set the translations as part of versioning preferences, + * however that should only be done if there are important use-cases. */ +#if 0 +# include "BLT_translation.h" +#else +# define N_(msgid) msgid +#endif + /* For versioning we only ever want to manipulate preferences passed in. */ #define U BLI_STATIC_ASSERT(false, "Global 'U' not allowed, only use arguments passed in!") |