summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-07-28 11:15:56 +0200
committerGitHub <noreply@github.com>2017-07-28 11:15:56 +0200
commit204ec5459bd1216e18fa19d36ef832692bae070f (patch)
tree4ae36574db069312179c1fe3a468c805184b88a3 /scene
parentd9b4969c18b3f5994621bbb06e496dd19c40e300 (diff)
parent707bb96fa808476bf2cfe36f9382d7b5b2589881 (diff)
Merge pull request #9932 from djrm/vs_fixes
Do not allow multiple data connections to the same data input slot, f…
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/graph_edit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 1d37529a87..11f750ea70 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -601,7 +601,7 @@ void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const
int cp_neg_len = get_constant("bezier_len_neg");
if (diff > 0) {
- cp_offset = MAX(cp_len, diff * 0.5);
+ cp_offset = MIN(cp_len, diff * 0.5);
} else {
cp_offset = MAX(MIN(cp_len - diff, cp_neg_len), -diff * 0.5);
}