- Radiant is now Vista compatible (Aero must be disabled)

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

diff --git a/radiant/selection.cpp b/radiant/selection.cpp
index 75dbbaeefd69098be90f24ffddb4bb263e35f12e..d3995312ceb72c04e0df69bf6d367f82bff172d5 100644 (file)
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -2833,7 +2833,7 @@ public:
   {
     SetManipulatorMode(eTranslate);
     pivotChanged();
-    addSelectionChangeCallback(pivotChangedSelectionCaller(*this));
+    addSelectionChangeCallback(PivotChangedSelectionCaller(*this));
     AddGridChangeCallback(PivotChangedCaller(*this));
   }
   void pivotChanged() const
@@ -2846,7 +2846,7 @@ public:
   {
     pivotChanged();
   }
-  typedef MemberCaller1<RadiantSelectionSystem, const Selectable&, &RadiantSelectionSystem::pivotChangedSelection> pivotChangedSelectionCaller;
+  typedef MemberCaller1<RadiantSelectionSystem, const Selectable&, &RadiantSelectionSystem::pivotChangedSelection> PivotChangedSelectionCaller;
 
   void SetMode(EMode mode)
   {
@@ -3285,7 +3285,7 @@ public:
   /// \todo Support view-dependent nudge.
   void NudgeManipulator(const Vector3& nudge, const Vector3& view)
   {
-    if(ManipulatorMode() == eTranslate)
+    if(ManipulatorMode() == eTranslate || ManipulatorMode() == eDrag)
     {
       translateSelected(nudge);
     }
@@ -3987,8 +3987,8 @@ public:
   typedef MemberCaller1<Manipulator_, DeviceVector, &Manipulator_::mouseUp> MouseUpCaller;
 };
 
-void Scene_copyClosestFaceTexture(SelectionTest& test);
-void Scene_applyClosestFaceTexture(SelectionTest& test);
+void Scene_copyClosestTexture(SelectionTest& test);
+void Scene_applyClosestTexture(SelectionTest& test);
 
 class RadiantWindowObserver : public SelectionSystemWindowObserver
 {
@@ -4058,11 +4058,11 @@ public:
 
       if(modifiers == c_modifier_apply_texture)
       {
-        Scene_applyClosestFaceTexture(volume);
+        Scene_applyClosestTexture(volume);
       }
       else if(modifiers == c_modifier_copy_texture)
       {
-        Scene_copyClosestFaceTexture(volume);
+        Scene_copyClosestTexture(volume);
       }
     }
   }