Merge branch 'master' into scale-icon-change

This commit is contained in:
Menotdan
2023-05-10 17:16:44 -04:00
committed by GitHub
70 changed files with 7743 additions and 3714 deletions

View File

@@ -655,7 +655,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (uiControl.Name.StartsWith(previousName))
{
string newName = controlType.Name + uiControl.Name.Substring(previousName.Length);
uiControl.Name = StringUtils.IncrementNameNumber(newName, x => uiControl.Parent.GetChild(x) == null);
if (uiControl.Parent != null)
newName = StringUtils.IncrementNameNumber(newName, x => uiControl.Parent.GetChild(x) == null);
uiControl.Name = newName;
}
}