[Bf-blender-cvs] [0b4b3abc0be] master: Merge branch 'blender-v3.3-release'

[Hans Goudey]

Commit: 0b4b3abc0bedf83a0c03732f5de8088ca9627b3a
Author: Hans Goudey
Date:   Fri Sep 2 15:49:33 2022 -0500
Branches: master
https://developer.blender.org/rB0b4b3abc0bedf83a0c03732f5de8088ca9627b3a

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/editors/space_node/node_relationships.cc
index 0240aeaeb68,ce4ae421498..05d0a546b08
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@@ -620,8 -639,13 +620,9 @@@ static int link_socket_to_viewer(const 
    if (viewer_bnode == nullptr) {
      /* Create a new viewer node if none exists. */
      const int viewer_type = get_default_viewer_type(&C);
-     const float2 location{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);
++    const float2 location{bsocket_to_view.locx / UI_DPI_FAC + 100,
++                          bsocket_to_view.locy / UI_DPI_FAC};
 +    viewer_bnode = add_static_node(C, viewer_type, location);
      if (viewer_bnode == nullptr) {
        return OPERATOR_CANCELLED;
      }