blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Cleanup: Don't do recursion where possible in node.cc #105394

Merged
Hans Goudey merged 25 commits from mod_moder/blender:cleanup_bke_nodes_unwrap_recursion into main 2023-03-06 18:39:30 +01:00
Conversation 1 Commits 25 Files Changed 1 +8 -13
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed5d5c9fed - Show all commits

21
source/blender/blenkernel/intern/node.cc
View File

@ -2555,22 +2555,14 @@ void nodeInternalRelink(bNodeTree *ntree, bNode *node)
}
}
/**
* Location mapping in parent frame node space.
*/
static void nodeViewMapping(const bNode *node, float &mapping_x, float &mapping_y)
{
for (const bNode *node_iter = node; node_iter; node_iter = node_iter->parent) {
mapping_x += node_iter->locx;
mapping_y += node_iter->locy;
}
}
void nodeToView(const bNode *node, const float x, const float y, float *rx, float *ry)
{
float mapping_x = 0.0f;
float mapping_y = 0.0f;
nodeViewMapping(node, mapping_x, mapping_y);
for (const bNode *node_iter = node; node_iter; node_iter = node_iter->parent) {
mapping_x += node_iter->locx;
mapping_y += node_iter->locy;
}
*rx = mapping_x + x;
*ry = mapping_y + y;
@ -2580,7 +2572,10 @@ void nodeFromView(const bNode *node, const float x, const float y, float *rx, fl
{
float mapping_x = 0.0f;
float mapping_y = 0.0f;
nodeViewMapping(node, mapping_x, mapping_y);
for (const bNode *node_iter = node; node_iter; node_iter = node_iter->parent) {
mapping_x += node_iter->locx;
mapping_y += node_iter->locy;
}
*rx = -mapping_x + x;
*ry = -mapping_y + y;