Skip to content

Commit 6eef49e

Browse files
lawwonglawwong
authored andcommitted
Add multiple symbols for each SymbolReq
1 parent d8ce70d commit 6eef49e

1 file changed

Lines changed: 18 additions & 4 deletions

File tree

Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,23 +450,37 @@ private static void DoUpdateScriptingDefineSymbols()
450450
{
451451
if (symbolReq.Validate())
452452
{
453-
if (!string.IsNullOrEmpty(symbolReq.symbol)) { validSymbols.Add(symbolReq.symbol); }
453+
if (!string.IsNullOrEmpty(symbolReq.symbol))
454+
{
455+
invalidSymbols.Remove(symbolReq.symbol);
456+
validSymbols.Add(symbolReq.symbol);
457+
}
454458
if (symbolReq.symbols != null)
455459
{
456460
foreach (var symbol in symbolReq.symbols)
457461
{
458-
if (!string.IsNullOrEmpty(symbol)) { validSymbols.Add(symbol); }
462+
if (!string.IsNullOrEmpty(symbol))
463+
{
464+
invalidSymbols.Remove(symbol);
465+
validSymbols.Add(symbol);
466+
}
459467
}
460468
}
461469
}
462470
else
463471
{
464-
if (!string.IsNullOrEmpty(symbolReq.symbol)) { invalidSymbols.Add(symbolReq.symbol); }
472+
if (!string.IsNullOrEmpty(symbolReq.symbol) && !validSymbols.Contains(symbolReq.symbol))
473+
{
474+
invalidSymbols.Add(symbolReq.symbol);
475+
}
465476
if (symbolReq.symbols != null)
466477
{
467478
foreach (var symbol in symbolReq.symbols)
468479
{
469-
if (!string.IsNullOrEmpty(symbol)) { invalidSymbols.Add(symbol); }
480+
if (!string.IsNullOrEmpty(symbol) && !validSymbols.Contains(symbol))
481+
{
482+
invalidSymbols.Add(symbol);
483+
}
470484
}
471485
}
472486
}

0 commit comments

Comments
 (0)