Commit: 27103c56b4f520b1b9d49419d8e1a5439b2244b5 Author: Campbell Barton Date: Thu Nov 4 14:46:07 2021 +1100 Branches: blender-v3.0-release https://developer.blender.org/rB27103c56b4f520b1b9d49419d8e1a5439b2244b5
Versioning: remove use of translations when loading preferences Add note why translations can't be used while versioning. =================================================================== M source/blender/blenloader/intern/versioning_userdef.c =================================================================== 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!") _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
