Merge branch 'master' into blender2.8

2018-09-13 18:19:24 +10:00
parent d538de90a7 a6fc718029
commit af1cf00003
5 changed files with 24 additions and 5 deletions
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -614,7 +614,7 @@ class AddPresetOperator(AddPresetBase, Operator):

        prefix, suffix = self.operator.split("_OT_", 1)
        op = getattr(getattr(bpy.ops, prefix.lower()), suffix)
-        operator_rna = op.get_rna().bl_rna
+        operator_rna = op.get_rna_type()
        del op

        ret = []