Merge branch 'master' into blender2.8

2018-09-13 20:15:18 +10:00
parent 2c4f091feb 254067106e
commit 09aa446100
4 changed files with 13 additions and 84 deletions
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -545,7 +545,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
        for n in opname.split('.'):
            op = getattr(op, n)
        try:
-            return op.get_rna().bl_rna.translation_context
+            return op.get_rna_type().translation_context
        except Exception as e:
            default_op_context = i18n_contexts.operator_default
            print("ERROR: ", str(e))