[Bf-blender-cvs] [161c13e12be] master: Fix building without translations enabled

Campbell Barton noreply at git.blender.org
Wed Apr 8 02:27:36 CEST 2020


Commit: 161c13e12be0c968808612010268e81c88327f65
Author: Campbell Barton
Date:   Wed Apr 8 10:24:33 2020 +1000
Branches: master
https://developer.blender.org/rB161c13e12be0c968808612010268e81c88327f65

Fix building without translations enabled

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

M	source/blender/blentranslation/BLT_translation.h
M	source/blender/makesdna/DNA_userdef_types.h

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

diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h
index 01e32c3f71a..74c46b1cf3e 100644
--- a/source/blender/blentranslation/BLT_translation.h
+++ b/source/blender/blentranslation/BLT_translation.h
@@ -32,10 +32,6 @@
 extern "C" {
 #endif
 
-/* Locale Ids. Auto will try to get local from OS. Our default is English though. */
-#define ULANGUAGE_AUTO 0
-#define ULANGUAGE_ENGLISH 1
-
 bool BLT_is_default_context(const char *msgctxt);
 const char *BLT_pgettext(const char *msgctxt, const char *msgid);
 
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 667b6bbf33c..d2a099b4fcf 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -1305,6 +1305,13 @@ typedef enum eUserpref_DiskCacheCompression {
   USER_SEQ_DISK_CACHE_COMPRESSION_HIGH = 2,
 } eUserpref_DiskCacheCompression;
 
+/* Locale Ids. Auto will try to get local from OS. Our default is English though. */
+/** #UserDef.language */
+enum {
+  ULANGUAGE_AUTO = 0,
+  ULANGUAGE_ENGLISH = 1,
+};
+
 #ifdef __cplusplus
 }
 #endif



More information about the Bf-blender-cvs mailing list