[Bf-blender-cvs] [47006dbdce4] temp-node-tree-pages-prototype: use tab to switch between portals

[Jacques Lucke]

Commit: 47006dbdce46153f3ae67e66715bbb0872502342
Author: Jacques Lucke
Date:   Thu Mar 18 12:52:19 2021 +0100
Branches: temp-node-tree-pages-prototype
https://developer.blender.org/rB47006dbdce46153f3ae67e66715bbb0872502342

use tab to switch between portals

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_operators/node.py

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index c0034f46f6e..58d3ce4321f 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1830,7 +1830,7 @@ def km_node_editor(params):
         ])
 
     items.extend([
-        ("node.follow_portal", {"type": 'O', "value": 'PRESS'}, None),
+        ("node.follow_portal", {"type": 'TAB', "value": 'PRESS'}, None),
         ("node.select_box", {"type": params.select_tweak, "value": 'ANY'},
          {"properties": [("tweak", True)]}),
         ("node.select_lasso", {"type": 'EVT_TWEAK_L', "value": 'ANY', "ctrl": True, "alt": True},
diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py
index 5d3d2192a77..86cc9c96034 100644
--- a/release/scripts/startup/bl_operators/node.py
+++ b/release/scripts/startup/bl_operators/node.py
@@ -312,14 +312,14 @@ class NODE_OT_follow_portal(Operator):
     @classmethod
     def poll(cls, context):
         space = context.space_data
-        return space.type == 'NODE_EDITOR'
+        return (space.type == 'NODE_EDITOR'
+            and space.node_tree
+            and space.node_tree.nodes.active.bl_idname in ('NodePortalIn', 'NodePortalOut'))
 
     def execute(self, context):
         space = context.space_data
         ntree = space.node_tree
         old_active_node = ntree.nodes.active
-        if old_active_node is None or old_active_node.bl_idname not in ('NodePortalIn', 'NodePortalOut'):
-            return {'CANCELLED'}
 
         portal_id = old_active_node.portal_id
         if old_active_node.bl_idname == 'NodePortalIn':