Browse Source

Merge pull request #23229 from CakHuri/fix-treshold

Fixed a typo, treshold to threshold.
Rémi Verschelde 6 years ago
parent
commit
a36a99b846
2 changed files with 2 additions and 3 deletions
  1. 2 2
      scene/gui/gradient_edit.cpp
  2. 0 1
      servers/physics/collision_solver_sat.cpp

+ 2 - 2
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) {

+ 0 - 1
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..