Regression: Node Editor: Framed nodes are pasted with an offset #106097

New Issue

Leon Schittek · 2023-03-24T11:51:13+01:00

Leon Schittek commented

2023-03-24 11:51:13 +01:00

System Information
Operating system: macOS-11.6.5-x86_64-i386-64bit 64 Bits
Graphics card: Intel Iris OpenGL Engine Intel Inc. 4.1 INTEL-16.5.9

Blender Version
Broken: version: 3.6.0 Alpha, branch: main, commit date: 2023-03-23 23:11, hash: f7946b486b0f
Broken: version: 3.5.0 Beta, branch: blender-v3.5-release
Worked: 3.4.1

Caused by 7355d64f2b

Short description of error
Nodes that are contained inside a frame are pasted with an offset. This
offset accumulates the more levels of nesting there are.

The attached video shows the behavior with the attached blend file.

Exact steps for others to reproduce the error
With the attached .blend file:

Open the file.
Select all the nodes on the canvas and copy them with ctrl + C
Move the cursor and paste the nodes with ctrl + V
Result: The framed nodes will be placed with an offset compared to the cursor. The offset is larger the more frames are around a node.

From scratch:

Open any node editor.
Add a node and frame it using ctrl + J.
Select the frame and the node it contains.
Copy the selected nodes with ctrl + C.
Move the cursor and paste the nodes with ctrl + V
Result: The nodes will be placed with an offset compared to the cursor.

**System Information** Operating system: macOS-11.6.5-x86_64-i386-64bit 64 Bits Graphics card: Intel Iris OpenGL Engine Intel Inc. 4.1 INTEL-16.5.9 **Blender Version** Broken: version: 3.6.0 Alpha, branch: main, commit date: 2023-03-23 23:11, hash: `f7946b486b0f` Broken: version: 3.5.0 Beta, branch: blender-v3.5-release Worked: 3.4.1 Caused by 7355d64f2be5 **Short description of error** Nodes that are contained inside a frame are pasted with an offset. This offset accumulates the more levels of nesting there are. The attached video shows the behavior with the attached blend file. **Exact steps for others to reproduce the error** With the attached .blend file: 1. Open the file. 2. Select all the nodes on the canvas and copy them with `ctrl + C` 3. Move the cursor and paste the nodes with `ctrl + V` 4. **Result:** The framed nodes will be placed with an offset compared to the cursor. The offset is larger the more frames are around a node. From scratch: 1. Open any node editor. 2. Add a node and frame it using `ctrl + J`. 3. Select the frame and the node it contains. 4. Copy the selected nodes with `ctrl + C`. 5. Move the cursor and paste the nodes with `ctrl + V` 6. **Result:** The nodes will be placed with an offset compared to the cursor.

paste-framed-nodes-test.blend

874 KiB

paste-framed-nodes.mp4

246 KiB

Leon Schittek added the

labels 2023-03-24 11:51:13 +01:00

Philipp Oeser commented

2023-03-24 11:55:31 +01:00

Can confirm, will check...

Philipp Oeser added

and removed

labels 2023-03-24 11:55:40 +01:00

Leon Schittek commented

2023-03-24 12:00:24 +01:00

@lichtwerk I also took a look but thought I'd report first since it might be time critical. I think this fixes it:

diff --git a/source/blender/editors/space_node/clipboard.cc b/source/blender/editors/space_node/clipboard.cc
index 95c1c25e343..177d3a45c4b 100644
--- a/source/blender/editors/space_node/clipboard.cc
+++ b/source/blender/editors/space_node/clipboard.cc
@@ -263,8 +263,11 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op)
     const float2 offset = (mouse_location - center) / UI_DPI_FAC;
 
     for (bNode *new_node : node_map.values()) {
-      new_node->locx += offset.x;
-      new_node->locy += offset.y;
+      /* Skip the offset for parented nodes since the location is in parent space. */
+      if (new_node->parent == nullptr) {
+        new_node->locx += offset.x;
+        new_node->locy += offset.y;
+      }
     }
   }

Should I bother with a PR for the release branch?

@lichtwerk I also took a look but thought I'd report first since it might be time critical. I think this fixes it: ``` diff --git a/source/blender/editors/space_node/clipboard.cc b/source/blender/editors/space_node/clipboard.cc index 95c1c25e343..177d3a45c4b 100644 --- a/source/blender/editors/space_node/clipboard.cc +++ b/source/blender/editors/space_node/clipboard.cc @@ -263,8 +263,11 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op) const float2 offset = (mouse_location - center) / UI_DPI_FAC; for (bNode *new_node : node_map.values()) { - new_node->locx += offset.x; - new_node->locy += offset.y; + /* Skip the offset for parented nodes since the location is in parent space. */ + if (new_node->parent == nullptr) { + new_node->locx += offset.x; + new_node->locy += offset.y; + } } } ``` Should I bother with a PR for the release branch?

Philipp Oeser commented

2023-03-24 12:13:52 +01:00

Should I bother with a PR for the release branch?

go for it (if it is considered low enough prio for 3.5, the PR can still be changed to go into main instead)

> Should I bother with a PR for the release branch? go for it (if it is considered low enough prio for 3.5, the PR can still be changed to go into main instead)

Philipp Oeser changed title from ~~Node Editor: Framed nodes are pasted with an offset~~ to Regression: Node Editor: Framed nodes are pasted with an offset

2023-03-24 12:19:20 +01:00

Philipp Oeser added

and removed

labels 2023-03-24 12:19:46 +01:00

Leon Schittek referenced a pull request that will close this issue

2023-03-24 12:25:36 +01:00