[Bf-blender-cvs] [2e9854536f1] temp-link-portals: progress
Jacques Lucke
noreply at git.blender.org
Mon Nov 8 18:48:48 CET 2021
Commit: 2e9854536f1c64079e8cd8a1cb617b0f5473a7e2
Author: Jacques Lucke
Date: Mon Nov 8 16:48:55 2021 +0100
Branches: temp-link-portals
https://developer.blender.org/rB2e9854536f1c64079e8cd8a1cb617b0f5473a7e2
progress
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_node.py
M source/blender/editors/space_node/drawnode.cc
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index d6032a3ecce..665b8aea206 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2002,6 +2002,7 @@ def km_node_editor(params):
("node.links_cut",
{"type": 'EVT_TWEAK_L' if params.legacy else 'EVT_TWEAK_R', "value": 'ANY', "ctrl": True}, None),
("node.links_mute", {"type": 'EVT_TWEAK_R', "value": 'ANY', "ctrl": True, "alt": True}, None),
+ ("node.make_link_portals", {"type": 'RIGHTMOUSE', "value": 'PRESS', "key_modifier": 'V'}, None),
("node.select_link_viewer", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "ctrl": True}, None),
("node.backimage_move", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "alt": True}, None),
("node.backimage_zoom", {"type": 'V', "value": 'PRESS', "repeat": True},
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 2fda13184da..3b11542b3de 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -345,6 +345,7 @@ class NODE_MT_node(Menu):
layout.operator("node.links_cut")
layout.operator("node.links_detach")
layout.operator("node.links_mute")
+ layout.operator("node.make_link_portals")
layout.separator()
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 07a70d5d8da..e336e3abd4d 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -4276,7 +4276,7 @@ void node_draw_link_bezier(const bContext *C,
int th_col2,
int th_col3)
{
- const float dim_factor = node_link_dim_factor(v2d, link);
+ float dim_factor = node_link_dim_factor(v2d, link);
float thickness = 1.5f;
float dash_factor = 1.0f;
@@ -4353,8 +4353,12 @@ void node_draw_link_bezier(const bContext *C,
}
if (link->flag & NODE_LINK_PORTAL) {
- copy_v4_fl4(colors[1], 1, 1, 1, 0.3);
- copy_v4_fl4(colors[2], 1, 1, 1, 0.3);
+ if (is_fromnode_selected || is_tonode_selected) {
+ dim_factor = 0.3f;
+ }
+ else {
+ dim_factor = 0.0f;
+ }
}
if (g_batch_link.enabled && !highlighted) {
More information about the Bf-blender-cvs
mailing list