Merge remote-tracking branch 'origin/master' into 1.10

This commit is contained in:
Wojtek Figat
2025-03-07 23:41:02 +01:00
42 changed files with 1215 additions and 130 deletions

View File

@@ -1557,11 +1557,11 @@ namespace FlaxEditor.Utilities
return false;
}
internal static ISceneContextWindow GetSceneContext(this Control c)
internal static ISceneEditingContext GetSceneContext(this Control c)
{
while (c != null && !(c is ISceneContextWindow))
while (c != null && !(c is ISceneEditingContext))
c = c.Parent;
return c as ISceneContextWindow;
return c as ISceneEditingContext;
}
}
}