Fixed: texture copy/paste in the visual mode was detected as failed pasting and caused a beep. (reported by DOOMGABR, abbuw, Turret_Master)

This commit is contained in:
ZZYZX 2017-03-17 17:48:14 +02:00
parent 6f1b6c7278
commit 814fdd9027
3 changed files with 12 additions and 6 deletions

View file

@ -29,6 +29,7 @@ using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.VisualModes;
#endregion
@ -380,9 +381,14 @@ namespace CodeImp.DoomBuilder.Editing
}
else
{
// Nothing usefull on the clipboard
General.MessageBeep(MessageBeepType.Warning);
}
// Nothing useful on the clipboard
// [ZZ] don't beep if 3D mode is currently engaged. the 3D mode allows you to copy/paste non-geometry stuff.
// note that this is a hack and probably needs to be fixed properly by making it beep elsewhere so that the current active mode can decide this.
if (!(General.Editing.Mode is VisualMode))
{
General.MessageBeep(MessageBeepType.Warning);
}
}
}
else
{

View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2949")]
[assembly: AssemblyVersion("2.3.0.2951")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("579b90a")]
[assembly: AssemblyHash("6f1b6c7")]

View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2949")]
[assembly: AssemblyVersion("2.3.0.2951")]
[assembly: NeutralResourcesLanguageAttribute("en")]