blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix #111593: Auto-offset when inserting nodes on links inside frames #111637

Merged
Leon Schittek merged 2 commits from lone_noel/blender:fix-111593-node-insert-bug into main 2023-08-30 22:08:31 +02:00
Conversation 0 Commits 2 Files Changed 2 +11 -16
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_node_runtime.hh
View File

@ -288,8 +288,6 @@ class bNodeRuntime : NonCopyable, NonMovable {
/** Update flags. */
int update = 0;
/** Initial locx for insert offset animation. */
float anim_init_locx;
/** Offset that will be added to locx for insert offset animation. */
float anim_ofsx;

25
source/blender/editors/space_node/node_relationships.cc
View File

@ -2319,7 +2319,6 @@ static void node_offset_apply(bNode &node, const float offset_x)
{
/* NODE_TEST is used to flag nodes that shouldn't be offset (again) */
if ((node.flag & NODE_TEST) == 0) {
node.runtime->anim_init_locx = node.locx;
node.runtime->anim_ofsx = (offset_x / UI_SCALE_FAC);
node.flag |= NODE_TEST;
}
@ -2554,18 +2553,16 @@ static int node_insert_offset_modal(bContext *C, wmOperator *op, const wmEvent *
* main thread might be so busy that node hasn't reached final position yet */
for (bNode *node : snode->edittree->all_nodes()) {
if (UNLIKELY(node->runtime->anim_ofsx)) {
const float endval = node->runtime->anim_init_locx + node->runtime->anim_ofsx;
if (IS_EQF(node->locx, endval) == false) {
node->locx = BLI_easing_cubic_ease_in_out(duration,
node->runtime->anim_init_locx,
node->runtime->anim_ofsx,
NODE_INSOFS_ANIM_DURATION);
if (node->runtime->anim_ofsx < 0) {
CLAMP_MIN(node->locx, endval);
}
else {
CLAMP_MAX(node->locx, endval);
}
const float prev_duration = duration - float(iofsd->anim_timer->delta);
/* Clamp duration to not overshoot. */
const float clamped_duration = math::min(duration, NODE_INSOFS_ANIM_DURATION);
if (prev_duration < clamped_duration) {
const float offset_step = node->runtime->anim_ofsx *
(BLI_easing_cubic_ease_in_out(
clamped_duration, 0.0f, 1.0f, NODE_INSOFS_ANIM_DURATION) -
BLI_easing_cubic_ease_in_out(
prev_duration, 0.0f, 1.0f, NODE_INSOFS_ANIM_DURATION));
node->locx += offset_step;
redraw = true;
}
}
@ -2579,7 +2576,7 @@ static int node_insert_offset_modal(bContext *C, wmOperator *op, const wmEvent *
WM_event_timer_remove(CTX_wm_manager(C), nullptr, iofsd->anim_timer);
for (bNode *node : snode->edittree->all_nodes()) {
node->runtime->anim_init_locx = node->runtime->anim_ofsx = 0.0f;
node->runtime->anim_ofsx = 0.0f;
}
MEM_freeN(iofsd);