diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /release/scripts/modules/bl_i18n_utils/bl_extract_messages.py | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'release/scripts/modules/bl_i18n_utils/bl_extract_messages.py')
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/bl_extract_messages.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index b395aab7772..dd679f230d2 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -248,7 +248,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): # Now here is the *ugly* hack! # Unfortunately, all classes we want to access are not available from bpy.types (OperatorProperties subclasses # are not here, as they have the same name as matching Operator ones :( ). So we use __subclasses__() calls - # to walk through all rna hierachy. + # to walk through all rna hierarchy. # But unregistered classes remain listed by relevant __subclasses__() calls (be it a Py or BPY/RNA bug), # and obviously the matching RNA struct exists no more, so trying to access their data (even the identifier) # quickly leads to segfault! @@ -498,7 +498,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings): def extract_strings_split(node): """ Returns a list args as returned by 'extract_strings()', but split into groups based on separate_nodes, this way - expressions like ("A" if test else "B") wont be merged but "A" + "B" will. + expressions like ("A" if test else "B") won't be merged but "A" + "B" will. """ estr_ls = [] nds_ls = [] |