From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 15 May 2011 20:18:14 +0000 (+0200)
Subject: radiant: make shift-middle, and ctrl-middle also paste
X-Git-Tag: xonotic-v0.5.0~28^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32c2fd3b6229504f780d729bbd67dc88f42614b3;p=xonotic%2Fnetradiant.git

radiant: make shift-middle, and ctrl-middle also paste

not only shift-ctrl-middle
---

diff --git a/radiant/selection.cpp b/radiant/selection.cpp
index 3b477990..d2283d45 100644
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -3872,7 +3872,9 @@ const ModifierFlags c_modifier_toggle_face = c_modifier_toggle | c_modifier_face
 const ModifierFlags c_modifier_replace_face = c_modifier_replace | c_modifier_face;
 
 const ButtonIdentifier c_button_texture = c_buttonMiddle;
-const ModifierFlags c_modifier_apply_texture = c_modifierControl | c_modifierShift;
+const ModifierFlags c_modifier_apply_texture1 = c_modifierControl | c_modifierShift;
+const ModifierFlags c_modifier_apply_texture2 = c_modifierControl;
+const ModifierFlags c_modifier_apply_texture3 =                     c_modifierShift;
 const ModifierFlags c_modifier_copy_texture = c_modifierNone;
 
 class Selector_
@@ -4094,7 +4096,7 @@ public:
       ConstructSelectionTest(scissored, SelectionBoxForPoint(&devicePosition[0], &m_selector.m_epsilon[0]));
       SelectionVolume volume(scissored);
 
-      if(modifiers == c_modifier_apply_texture)
+      if(modifiers == c_modifier_apply_texture1 || modifiers == c_modifier_apply_texture2 || modifiers == c_modifier_apply_texture3)
       {
         Scene_applyClosestTexture(volume);
       }