[Bf-blender-cvs] [831ed297d0a] blender-v3.3-release: Fix T100767: Geometry nodes viewer node placed incorrectly

Hans Goudey noreply at git.blender.org
Fri Sep 2 22:48:51 CEST 2022


Commit: 831ed297d0a02c34664d2a5d8367fbacb899a4a2
Author: Hans Goudey
Date:   Fri Sep 2 15:48:41 2022 -0500
Branches: blender-v3.3-release
https://developer.blender.org/rB831ed297d0a02c34664d2a5d8367fbacb899a4a2

Fix T100767: Geometry nodes viewer node placed incorrectly

See explanation in comment.

Differential Revision: https://developer.blender.org/D15864

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

M	source/blender/editors/space_node/node_relationships.cc

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

diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index e10bedb18f4..ce4ae421498 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -639,8 +639,13 @@ static int link_socket_to_viewer(const bContext &C,
   if (viewer_bnode == nullptr) {
     /* Create a new viewer node if none exists. */
     const int viewer_type = get_default_viewer_type(&C);
-    viewer_bnode = node_add_node(
-        C, nullptr, viewer_type, bsocket_to_view.locx + 100, bsocket_to_view.locy);
+    /* The socket location is in view space, so dividing by #UI_DPI_FAC
+     * brings it into the coordinate space of the node editor. */
+    viewer_bnode = node_add_node(C,
+                                 nullptr,
+                                 viewer_type,
+                                 bsocket_to_view.locx / UI_DPI_FAC + 100,
+                                 bsocket_to_view.locy / UI_DPI_FAC);
     if (viewer_bnode == nullptr) {
       return OPERATOR_CANCELLED;
     }



More information about the Bf-blender-cvs mailing list