archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2018-09-13 11:27:38 +02:00
parent aacdd28edd 2be1d8bbaf
commit 2c4f091feb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blentranslation/intern/blt_translation.c
View File

@@ -41,6 +41,7 @@
#include "BLI_fileops.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "BLI_threads.h"
#include "DNA_userdef_types.h" /* For user settings. */
@@ -91,7 +92,7 @@ const char *BLT_pgettext(const char *msgctxt, const char *msgid)
bool BLT_translate(void)
{
#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) != 0;
return BLI_thread_is_main() && (U.transopts & USER_DOTRANSLATE);
#else
return false;
#endif
@@ -100,7 +101,7 @@ bool BLT_translate(void)
bool BLT_translate_iface(void)
{
#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_IFACE);
return BLT_translate() && (U.transopts & USER_TR_IFACE);
#else
return false;
#endif
@@ -109,7 +110,7 @@ bool BLT_translate_iface(void)
bool BLT_translate_tooltips(void)
{
#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_TOOLTIPS);
return BLT_translate() && (U.transopts & USER_TR_TOOLTIPS);
#else
return false;
#endif
@@ -118,7 +119,7 @@ bool BLT_translate_tooltips(void)
bool BLT_translate_new_dataname(void)
{
#ifdef WITH_INTERNATIONAL
return (U.transopts & USER_DOTRANSLATE) && (U.transopts & USER_TR_NEWDATANAME);
return BLT_translate() && (U.transopts & USER_TR_NEWDATANAME);
#else
return false;
#endif