diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-23 07:22:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 07:22:18 +0200 |
| commit | a36a99b846ddc6bb499dca9a7dcdecaada8d08b5 (patch) | |
| tree | be8f3ac02f93fad91281b8f6b84a4d3297fcea41 | |
| parent | b77a41125847633509a2af7d2e693ebdd4c35c01 (diff) | |
| parent | 90efe5be080041cd66176ab18a33d1c28a6bd8ea (diff) | |
Merge pull request #23229 from CakHuri/fix-treshold
Fixed a typo, treshold to threshold.
| -rw-r--r-- | scene/gui/gradient_edit.cpp | 4 | ||||
| -rw-r--r-- | servers/physics/collision_solver_sat.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/gradient_edit.cpp b/scene/gui/gradient_edit.cpp index 934b84ec0c..c13964d196 100644 --- a/scene/gui/gradient_edit.cpp +++ b/scene/gui/gradient_edit.cpp @@ -236,8 +236,8 @@ void GradientEdit::_gui_input(const Ref<InputEvent> &p_event) { //Snap to nearest point if holding shift if (mm->get_shift()) { - float snap_treshhold = 0.03; - float smallest_ofs = snap_treshhold; + float snap_threshold = 0.03; + float smallest_ofs = snap_threshold; bool found = false; int nearest_point = 0; for (int i = 0; i < points.size(); ++i) { diff --git a/servers/physics/collision_solver_sat.cpp b/servers/physics/collision_solver_sat.cpp index 087ae570fb..f17f6f7014 100644 --- a/servers/physics/collision_solver_sat.cpp +++ b/servers/physics/collision_solver_sat.cpp @@ -98,7 +98,6 @@ static void _generate_contacts_edge_edge(const Vector3 *p_points_A, int p_point_ Vector3 c = rel_A.cross(rel_B).cross(rel_B); - //if ( Math::abs(rel_A.dot(c) )<_EDGE_IS_VALID_SUPPORT_TRESHOLD ) { if (Math::abs(rel_A.dot(c)) < CMP_EPSILON) { // should handle somehow.. |