Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +12 -7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d3ce8273a - Show all commits

19
source/blender/editors/transform/transform_convert_node.cc
View File

@ -48,11 +48,11 @@ static void create_transform_data_for_node(TransData &td,
/* account for parents (nested nodes) */ /* account for parents (nested nodes) */
if (node.parent) { if (node.parent) {
nodeToView(node.parent, node.locx, node.locy, &locx, &locy); nodeToView(node.parent, node.locx + node.offsetx, node.locy + node.offsety, &locx, &locy);
} }
else { else {
locx = node.locx; locx = node.locx + node.offsetx;
locy = node.locy; locy = node.locy + node.offsety;
} }
/* use top-left corner as the transform origin for nodes */ /* use top-left corner as the transform origin for nodes */
@ -244,11 +244,16 @@ static void flushTransNodes(TransInfo *t)
/* account for parents (nested nodes) */ /* account for parents (nested nodes) */
if (node->parent) { if (node->parent) {
nodeFromView(node->parent, loc[0], loc[1], &loc[0], &loc[1]); nodeFromView(node->parent,
loc[0] - node->offsetx,
loc[1] - node->offsety,
&node->locx,
&node->locy);
}
else {
node->locx = loc[0] - node->offsetx;
node->locy = loc[1] - node->offsety;
} }
node->locx = loc[0];
node->locy = loc[1];
} }
/* handle intersection with noodles */ /* handle intersection with noodles */