From b604dfc4af5639f322759ad1e2799a5c45cf2319 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 23 Jan 2016 09:31:26 +0100
Subject: [PATCH] Merged in GZDB r2475.

---
 Source/Core/Controls/ThingBrowserControl.cs |   6 +++---
 Source/Core/Resources/SkySphere.md3         | Bin 8244 -> 8244 bytes
 Source/Core/ZDoom/ZDTextParser.cs           |   3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Controls/ThingBrowserControl.cs b/Source/Core/Controls/ThingBrowserControl.cs
index 848b0b8..61101f5 100644
--- a/Source/Core/Controls/ThingBrowserControl.cs
+++ b/Source/Core/Controls/ThingBrowserControl.cs
@@ -359,9 +359,9 @@ namespace CodeImp.DoomBuilder.Controls
 							// Select this
 							if(n.TreeView != null) //mxd. Tree node may've been removed during filtering
 							{
-								n.Parent.Expand();
-								typelist.SelectedNodes.Add(n);
-								n.EnsureVisible();
+                                if (n.Parent != null) n.Parent.Expand(); // node won't have parent when the list is prefiltered
+                                typelist.SelectedNodes.Add(n);
+                                n.EnsureVisible();
 								break;
 							}
 						}
diff --git a/Source/Core/Resources/SkySphere.md3 b/Source/Core/Resources/SkySphere.md3
index b0ad8cff19215aac2f675657bd5f7fbe7dcbdeb0..536069daa00d57149bfb1ac50b9a77bc7bddb7ec 100644
GIT binary patch
delta 1858
zcmYk7K};Q06o&7erdm;BOa)f*faIF;(zu~?Q{J0L(%4FPiCQo^&=5%4SR}>>BtmM&
zstFXqswlE5B}Nt&7EPfs>7on)7Els323QG?B@g1lhPatK{{Oiw`jVG#&fGh5&;QRk
z_s-?!a^H5pc6=cfDODLINnrtOK-}=$=es%e)bHQzd*5&9ss+>SFSS0(_Dp{2W7J>W
zx$alIQ|U9l{BhP_7`y3x7#{occIJ)Lm)WV8_v<-(c>O{>XEWw(j<;d<qV@H%4x`Fs
zP&k^*36)v`mEWgaysJ2_{G8@|<qzqC0;74|3x*M{h4XqOL3|||(kWg<IUQMYSM`G`
z>QhY;D^)M?XyW3^gyUhfXx;n)>z>bBd0~{XZh^dY3l7+Vy1#YoiEg?6$L-88qz=8b
zUw@*_Nv%GTnuFAvkopm%{<B(<y_$c|zks<<oA`H<WNG4ynEMq>Jcqfzk5xTW8&WLR
zMec*7m_gDUl4g-K4@B;6K67KtTuJ;%pIS(2<9%u+shy-39H%#69t*k~G>-!`lcc#M
z-6rY2i`|0!I*6k;&%afB{>s&kzV6=I@9v$u-}-FF$xx{pZ_%Dw=}F4K^qNy)R-G!d
za$vVL?r%6%=C1)e$au%8Guzen6~;xU((D!EZxrG~r`9~#iWOrffWJwK@h1u55~tpT
zC#vnf#f?&DgE={1`x&R49j4;IRxwUHTg<7RWG_a1#@S<PmD*%{WRuC<QZnA?+%gwS
zwLIVKTr-!3w7kFFxfhztJ6aOxayFU|%00=j*V$=$(w-;?ovr4xa!(X~&0>e5;T<gw
zj60jn4?|iUnsW7GCQG$Ac-Pg9`Sq3(rysDHGNCnd?h~ATcw{+v&1*|)S2~ksux@SL
zmXRBIJEy@yF+M{UXX8l)9!|hwP|e0230P8$A6u|AZ=1-}y4{PxbZ0U{)+zN9>EBT^
zafpk?IxQ2L=e0c0Uhc^Yx>`JWVQ&{4z`U@<lLbf0JxO4EUQ0q#by^a<dq+va51fFr
z5EA0a%t~8w4fNL*Z4J4Ru}dgXzpxeiXL(Vah=1XBbod37fNCOcO~8_^I6~R@r5RgK
zq9!&m!%w%3WnRsOH@ZA|Y$WaZe9ic>miNMWS!ZS%M&ds5VIB=)?6kTl#!jn7F%}eK
zK`|B-V?i+%6k|a#78GNr)$@(wEN-Mb$BtJtgp&%_Vh$+gfMO0fLvuheXIeEOnHn#r
zFG=I&bn|028o0p*0}E^{u*il257|hdVgrFC>>Ch$(@$0&glH68q}d=KKJzB&vmwAn
zHUikf1_0Yx_h1+69qePBgEv^;;0Ws)L|sclQ><geGpt__LMY%}2;t%I{>t0#v<TMS
z=@D$X(<IpC*08LD1GiZR|8XlotlefFyx=zXpv-OdL6zJ5gVUp9Kc*U9=LR2)x)Uat
Va3@aivpa!;S$84@za1s<@PGGR7^naM

delta 1858
zcmYk7PiS0K6vpp;LM>6TQifTX$p}~E;Vzw3C-WvyS`Ab1PY2|sHO!(##%Lu?z!BwH
z+>CW3Y9w*hCJ0&BaZ#Enu38@&ko;L#B<V^g*>y7FrUpUYeSY7$4K@&dbKX1mz4Lwd
zoOf5sE9EaHpI2%q=KryiyFY@X{KxOIdgSlYzc;?x()rtFGWdD?PU(Yd?+3UW{L=j}
z7<_FgV0`YqQgD0jQ}6BQ$la?WCv%^a){gXx%>H}xRFT<?na%rWksaIEuIeam*j!3h
zYztID(JDn&><o$fyTaI(HS=<5Q`ky7LT2;&jAE?L$GgfUl(k#X)bfC!qve4ClCUI-
zJDM+y;-+Q+Dky6fq=H@5kiuqEMPj9jWZX&_vw()ZdGE0Yx_a@~t0Pw+wfS_vc=)W7
z`W&QgKhrOkA+-jn??UQdYlEc=r{4%pA$Ro=6Ms+B5>0#xxe-h}j@-?;{Gs89Vqru;
z@g&UvW12(KEMBL1B+VpQ8_8NpW|P!HQX5IFB(;O$1xatf(_)rOkOE?w$po6q>vWqj
ztz^vIAh|o_%O_qLK5_m+ZDw+M_{$r|Z;n4+I~r{#O2yV!y<{o{2b>CX7z^-Lljdz7
zI{b`NWsWv%gK^HOGlPAbXY4zb=7p)Wmmogo)S6+Xwi!QEZANDCCd6Y-y@_7RXnDXH
zXM=gYspSO|&JJ^~tEGUtv&FoX^`y{gwh9Wo<a;6@ayFTdvfeBOea6<p{VQFafwBHP
zTMqHpP2FU?<lKwQwT$la!gXh(`EFKaJ;b-1on}QTpYcOm&7G-K?yoz0&062e`YmU(
z`K@8)1zp!K=8wFU0`^?rnESm%3f!0eiL7~WumuN}FJMc?(}HRzwG<raB^wsZRBVOJ
zZP;D{`n9x87L-~bgGH<W#|m2RpXq4HpU8T$zFzg@dDC?`hP<fiEvg7VT3N54!TFBv
zkV^%f^}y?ks!HBcs!qnWRO0mwEBCi5R`PdxiLBpiCyRXW{(*qY5Q5Q@^1uOh0+^Bh
zM_<Nv`w&tBe|+wpXG>93_m-L8^1U*8KA7i61jJTxlY{m$>HtyC$7DR7O1zHUVZ0^Z
z1QqOTC$fHTA(7|p|6hkv%W6!F1;toUj9pewjES?j;Me8~gQL+Rlf@iR%mKw5uuXG7
zF$WZLKrsgtb3ic%6mvi^2gFz?Rn}D*JaB-624c_}<WN7tWZ{R;i2||B)Kv{QLEsn%
z2dr{nzzGftSm%I%GxP+!%z*$~90U-9&?J}G_h6g-4nhchug2_eaN|`rHhyfep}`$C
zGPuVE2KNsXuy0p&h;HM@JABfe9$}WB2*i1Q8o(D@bE~=0H~GO2KX(T}_zkBJ@we`P
n2)}nHM)-p}LBgNhi4tzQ6DGXJp+f$yJAuMK-H8<bb5O&70v;3n

diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
index 8bf9105..4077fc5 100644
--- a/Source/Core/ZDoom/ZDTextParser.cs
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -485,6 +485,9 @@ namespace CodeImp.DoomBuilder.ZDoom
         protected void SkipStructure() { SkipStructure(new HashSet<string>()); }
         protected void SkipStructure(HashSet<string> breakat)
         {
+            // We need it to be case-insensitive
+            if (breakat.Count > 0) breakat = new HashSet<string>(breakat, StringComparer.OrdinalIgnoreCase);
+
             string token;
             do
             {