blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: Avoid using node socket location 

The location of a reroute node and its sockets should be the same,
only stored in different coordinate spaces. Because the node's location
is the ground truth, use that for finding whether the mouse is hovering.
This commit is contained in:
Hans Goudey 2022-09-02 16:43:12 -05:00
parent cd10fb4826
commit df40440d22
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_node/node_select.cc
View File

@ -141,14 +141,11 @@ static bNode *node_under_mouse_select(bNodeTree &ntree, const float2 mouse)
static bool node_under_mouse_tweak(const bNodeTree &ntree, const float2 &mouse)
{
using namespace blender::math;
LISTBASE_FOREACH_BACKWARD (const bNode *, node, &ntree.nodes) {
switch (node->type) {
case NODE_REROUTE: {
bNodeSocket *socket = (bNodeSocket *)node->inputs.first;
const float2 location{socket->locx, socket->locy};
if (distance(mouse, location) < 24.0f) {
const float2 location = node_to_view(*node, {node->locx, node->locy});
if (math::distance(mouse, location) < 24.0f) {
return true;
}
break;