From 614ec08dfd621bbbb18025f608cea1c6083c8c47 Mon Sep 17 00:00:00 2001 From: illua1 Date: Sun, 5 Mar 2023 19:42:20 +0300 Subject: [PATCH] init commit --- .../transform/transform_convert_node.cc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc index 13095ff6f5a..6d7b84a28ae 100644 --- a/source/blender/editors/transform/transform_convert_node.cc +++ b/source/blender/editors/transform/transform_convert_node.cc @@ -45,15 +45,7 @@ static void create_transform_data_for_node(TransData &td, const float dpi_fac) { float locx, locy; - - /* account for parents (nested nodes) */ - if (node.parent) { - nodeToView(node.parent, node.locx, node.locy, &locx, &locy); - } - else { - locx = node.locx; - locy = node.locy; - } + nodeToView(&node, node.offsetx, node.offsety, &locx, &locy); /* use top-left corner as the transform origin for nodes */ /* Weirdo - but the node system is a mix of free 2d elements and DPI sensitive UI. */ @@ -242,9 +234,11 @@ static void flushTransNodes(TransInfo *t) loc[0] /= dpi_fac; loc[1] /= dpi_fac; - /* account for parents (nested nodes) */ - if (node->parent) { - nodeFromView(node->parent, loc[0], loc[1], &loc[0], &loc[1]); + loc[0] -= node->offsetx; + loc[1] -= node->offsety; + + if (const bNode *parent_space = node->parent; parent_space != nullptr) { + nodeFromView(parent_space, loc[0], loc[1], &loc[0], &loc[1]); } node->locx = loc[0]; -- 2.30.2