[Bf-extensions-cvs] [29ec799e] master: Updated Blender ID add-on from upstream

[Sybren A. Stüvel]

Commit: 29ec799e8b8977a7a7e45b7c3188feb8196d04b9
Author: Sybren A. Stüvel
Date:   Wed Feb 13 11:58:18 2019 +0100
Branches: master
https://developer.blender.org/rBA29ec799e8b8977a7a7e45b7c3188feb8196d04b9

Updated Blender ID add-on from upstream

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

M	blender_id/__init__.py

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

diff --git a/blender_id/__init__.py b/blender_id/__init__.py
index 1110dadc..496c867d 100644
--- a/blender_id/__init__.py
+++ b/blender_id/__init__.py
@@ -267,9 +267,14 @@ class BlenderIdPreferences(AddonPreferences):
 class BlenderIdMixin:
     @staticmethod
     def addon_prefs(context):
-        preferences = context.user_preferences.addons[__name__].preferences
-        preferences.reset_messages()
-        return preferences
+        try:
+            prefs = context.preferences
+        except AttributeError:
+            prefs = context.user_preferences
+
+        addon_prefs = prefs.addons[__name__].preferences
+        addon_prefs.reset_messages()
+        return addon_prefs
 
 
 class BlenderIdLogin(BlenderIdMixin, Operator):
@@ -356,7 +361,7 @@ def register():
     bpy.utils.register_class(BlenderIdPreferences)
     bpy.utils.register_class(BlenderIdValidate)
 
-    preferences = bpy.context.user_preferences.addons[__name__].preferences
+    preferences = BlenderIdMixin.addon_prefs(bpy.context)
     preferences.reset_messages()