fix a typo that shouldn't have an impact on most maps though

[xonotic/netradiant.git] / radiant / selection.cpp

diff --git a/radiant/selection.cpp b/radiant/selection.cpp
index e9d2744f32d93d4c75a571f6e43cc7124fec40ca..3b4779905eca61df0ff25f04daec989d0dd76b66 100644 (file)
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -318,7 +318,7 @@ public:
     current = vector3_scaled(m_axis, distance_for_axis(m_start, current, m_axis));
 
     translation_local2object(current, current, manip2object);
-    vector3_snap(current, GetGridSize());
+    vector3_snap(current, GetSnapGridSize());
 
     m_translatable.translate(current);
   }
@@ -350,7 +350,7 @@ public:
     current = vector3_subtracted(current, m_start);
 
     translation_local2object(current, current, manip2object);
-    vector3_snap(current, GetGridSize());
+    vector3_snap(current, GetSnapGridSize());
     
     m_translatable.translate(current);
   }
@@ -386,9 +386,9 @@ public:
     Vector3 delta = vector3_subtracted(current, m_start);
 
     translation_local2object(delta, delta, manip2object);
-    vector3_snap(delta, GetGridSize());
+    vector3_snap(delta, GetSnapGridSize());
     
-    Vector3 start(vector3_snapped(m_start, GetGridSize()));
+    Vector3 start(vector3_snapped(m_start, GetSnapGridSize()));
     Vector3 scale(
       start[0] == 0 ? 1 : 1 + delta[0] / start[0],
       start[1] == 0 ? 1 : 1 + delta[1] / start[1],
@@ -424,9 +424,9 @@ public:
     Vector3 delta = vector3_subtracted(current, m_start);
 
     translation_local2object(delta, delta, manip2object);
-    vector3_snap(delta, GetGridSize());
+    vector3_snap(delta, GetSnapGridSize());
     
-    Vector3 start(vector3_snapped(m_start, GetGridSize()));
+    Vector3 start(vector3_snapped(m_start, GetSnapGridSize()));
     Vector3 scale(
       start[0] == 0 ? 1 : 1 + delta[0] / start[0],
       start[1] == 0 ? 1 : 1 + delta[1] / start[1],
@@ -2351,12 +2351,14 @@ void translation_for_pivoted_matrix_transform(Vector3& parent_translation, const
        
        translation_local2object(parent_translation, local_translation, localToParent);
 
+       /*
        // verify it!
        globalOutputStream() << "World pivot is at " << world_pivot << "\n";
        globalOutputStream() << "Local pivot is at " << local_pivot << "\n";
        globalOutputStream() << "Transformation " << local_transform << " moves it to: " << matrix4_transformed_point(local_transform, local_pivot) << "\n";
        globalOutputStream() << "Must move by " << local_translation << " in the local system" << "\n";
        globalOutputStream() << "Must move by " << parent_translation << " in the parent system" << "\n";
+       */
 }
 
 void translation_for_pivoted_rotation(Vector3& parent_translation, const Quaternion& local_rotation, const Vector3& world_pivot, const Matrix4& localToWorld, const Matrix4& localToParent)
@@ -3728,7 +3730,7 @@ void RadiantSelectionSystem::ConstructPivot() const
       m_object_pivot = bounds.origin;
     }
 
-    vector3_snap(m_object_pivot, GetGridSize());
+    vector3_snap(m_object_pivot, GetSnapGridSize());
     m_pivot2world = matrix4_translation_for_vec3(m_object_pivot);
 
     switch(m_manipulator_mode)