From 8234ffce1bcc9bc0621291f3cc299a2f3dd26ed5 Mon Sep 17 00:00:00 2001 From: parax0 Date: Tue, 22 Mar 2016 21:53:16 -0600 Subject: [PATCH] Fixed a bug in the unlink dialog, changed the link/unlink keyboard shortcuts --- src/Editor/WorldEditor/CConfirmUnlinkDialog.h | 1 + src/Editor/WorldEditor/CWorldEditor.ui | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Editor/WorldEditor/CConfirmUnlinkDialog.h b/src/Editor/WorldEditor/CConfirmUnlinkDialog.h index 598a4f71..9f7eb489 100644 --- a/src/Editor/WorldEditor/CConfirmUnlinkDialog.h +++ b/src/Editor/WorldEditor/CConfirmUnlinkDialog.h @@ -34,6 +34,7 @@ private: public: explicit CConfirmUnlinkDialog(QWidget *pParent = 0) : QDialog(pParent) + , mChoice(eCancel) { mpLabel = new QLabel("Which links should be removed from the selected instances?"); mpAllButton = new QPushButton("All"); diff --git a/src/Editor/WorldEditor/CWorldEditor.ui b/src/Editor/WorldEditor/CWorldEditor.ui index 7498258c..d65c86dc 100644 --- a/src/Editor/WorldEditor/CWorldEditor.ui +++ b/src/Editor/WorldEditor/CWorldEditor.ui @@ -515,7 +515,7 @@ Link - Alt+C + L @@ -530,7 +530,7 @@ Unlink - Alt+D + U