[Bf-extensions-cvs] [8959f179] blender2.8: Update for keymap changes.

[Brecht Van Lommel]

Commit: 8959f1798cfc86924493347304118c61bd5c7f7a
Author: Brecht Van Lommel
Date:   Fri Nov 23 14:53:01 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBA8959f1798cfc86924493347304118c61bd5c7f7a

Update for keymap changes.

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

M	archipack/archipack_keymaps.py
M	development_iskeyfree.py
M	node_wrangler.py
M	uv_magic_uv/op/move_uv.py

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

diff --git a/archipack/archipack_keymaps.py b/archipack/archipack_keymaps.py
index a30b31e9..537833ee 100644
--- a/archipack/archipack_keymaps.py
+++ b/archipack/archipack_keymaps.py
@@ -52,7 +52,9 @@ class Keymaps:
         """
         # provide abstration between user and addon
         # with different select mouse side
-        mouse_right = context.user_preferences.inputs.select_mouse
+        wm = context.window_manager
+        keyconfig = wm.keyconfigs.active
+        mouse_right = getattr(keyconfig.preferences, "select_mouse", "LEFT")
         if mouse_right == 'LEFT':
             mouse_left = 'RIGHT'
             mouse_right_side = 'Left'
diff --git a/development_iskeyfree.py b/development_iskeyfree.py
index 7851afee..c2e3f34f 100644
--- a/development_iskeyfree.py
+++ b/development_iskeyfree.py
@@ -146,9 +146,9 @@ class MyChecker():
         allkeys = [
             "LEFTMOUSE", "MIDDLEMOUSE", "RIGHTMOUSE", "BUTTON4MOUSE", "BUTTON5MOUSE", "BUTTON6MOUSE",
             "BUTTON7MOUSE",
-            "ACTIONMOUSE", "SELECTMOUSE", "MOUSEMOVE", "INBETWEEN_MOUSEMOVE", "TRACKPADPAN", "TRACKPADZOOM",
+            "MOUSEMOVE", "INBETWEEN_MOUSEMOVE", "TRACKPADPAN", "TRACKPADZOOM",
             "MOUSEROTATE", "WHEELUPMOUSE", "WHEELDOWNMOUSE", "WHEELINMOUSE", "WHEELOUTMOUSE", "EVT_TWEAK_L",
-            "EVT_TWEAK_M", "EVT_TWEAK_R", "EVT_TWEAK_A", "EVT_TWEAK_S", "A", "B", "C", "D", "E", "F", "G", "H",
+            "EVT_TWEAK_M", "EVT_TWEAK_R", "A", "B", "C", "D", "E", "F", "G", "H",
             "I", "J",
             "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "ZERO", "ONE", "TWO",
             "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "LEFT_CTRL", "LEFT_ALT", "LEFT_SHIFT",
@@ -309,8 +309,6 @@ class IskeyFreeProperties(PropertyGroup):
             ("BUTTON5MOUSE", "BUTTON5MOUSE", ""),
             ("BUTTON6MOUSE", "BUTTON6MOUSE", ""),
             ("BUTTON7MOUSE", "BUTTON7MOUSE", ""),
-            ("ACTIONMOUSE", "ACTIONMOUSE", ""),
-            ("SELECTMOUSE", "SELECTMOUSE", ""),
             ("MOUSEMOVE", "MOUSEMOVE", ""),
             ("INBETWEEN_MOUSEMOVE", "INBETWEEN_MOUSEMOVE", ""),
             ("TRACKPADPAN", "TRACKPADPAN", ""),
@@ -323,8 +321,6 @@ class IskeyFreeProperties(PropertyGroup):
             ("EVT_TWEAK_L", "EVT_TWEAK_L", ""),
             ("EVT_TWEAK_M", "EVT_TWEAK_M", ""),
             ("EVT_TWEAK_R", "EVT_TWEAK_R", ""),
-            ("EVT_TWEAK_A", "EVT_TWEAK_A", ""),
-            ("EVT_TWEAK_S", "EVT_TWEAK_S", ""),
             ("A", "A", ""),
             ("B", "B", ""),
             ("C", "C", ""),
diff --git a/node_wrangler.py b/node_wrangler.py
index 0d30f3b6..0c0a2b40 100644
--- a/node_wrangler.py
+++ b/node_wrangler.py
@@ -557,7 +557,6 @@ def nice_hotkey_name(punc):
         ('LEFTMOUSE', "LMB"),
         ('MIDDLEMOUSE', "MMB"),
         ('RIGHTMOUSE', "RMB"),
-        ('SELECTMOUSE', "Select"),
         ('WHEELUPMOUSE', "Wheel Up"),
         ('WHEELDOWNMOUSE', "Wheel Down"),
         ('WHEELINMOUSE', "Wheel In"),
diff --git a/uv_magic_uv/op/move_uv.py b/uv_magic_uv/op/move_uv.py
index 6382376c..a5cc401c 100644
--- a/uv_magic_uv/op/move_uv.py
+++ b/uv_magic_uv/op/move_uv.py
@@ -100,7 +100,10 @@ class MUV_MVUV(bpy.types.Operator):
         bmesh.update_edit_mesh(obj.data)
 
         # check mouse preference
-        if context.user_preferences.inputs.select_mouse == 'RIGHT':
+        wm = context.window_manager
+        keyconfig = wm.keyconfigs.active
+        select_mouse = getattr(keyconfig.preferences, "select_mouse", "LEFT")
+        if select_mouse == 'RIGHT':
             confirm_btn = 'LEFTMOUSE'
             cancel_btn = 'RIGHTMOUSE'
         else: