about summary refs log tree commit diff
path: root/src/game/editor
diff options
context:
space:
mode:
authorxalduin <xalduin@gmail.com>2010-06-02 15:21:31 -0400
committerxalduin <xalduin@gmail.com>2010-06-02 15:21:31 -0400
commitcc181cda5be79c1097502ea30afb78400da962b7 (patch)
treeaa451cb046ef489dbbd7007f1cceb029e5879e48 /src/game/editor
parent9e6c9096248dc35a354050749b460fafdd21df7f (diff)
parent7a1953e60b58544144986d30cb30acfab6e0d465 (diff)
downloadzcatch-cc181cda5be79c1097502ea30afb78400da962b7.tar.gz
zcatch-cc181cda5be79c1097502ea30afb78400da962b7.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/game/editor')
-rw-r--r--src/game/editor/ed_editor.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp
index 0e478753..35a0b03a 100644
--- a/src/game/editor/ed_editor.cpp
+++ b/src/game/editor/ed_editor.cpp
@@ -1045,6 +1045,14 @@ void CEditor::DoQuadPoint(CQuad *q, int QuadIndex, int v)
 			s_Operation = OP_CONTEXT_MENU;
 			m_SelectedQuad = QuadIndex;
 			UI()->SetActiveItem(pId);
+			if(!(m_SelectedPoints&(1<<v)))

+			{

+				if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))

+					m_SelectedPoints |= 1<<v;

+				else

+					m_SelectedPoints = 1<<v;

+				s_Moved = true;

+			}
 		}
 	}
 	else