Merge branch 'master' into 1.5

# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
This commit is contained in:
Wojtek Figat
2022-11-21 15:51:57 +01:00
62 changed files with 391 additions and 351 deletions

View File

@@ -9,7 +9,7 @@
/// <summary>
/// Sky light captures the distant parts of the scene and applies it as a light. Allows to add ambient light.
/// </summary>
API_CLASS() class FLAXENGINE_API SkyLight : public Light
API_CLASS(Attributes="ActorContextMenu(\"New/Lights/Sky Light\")") class FLAXENGINE_API SkyLight : public Light
{
DECLARE_SCENE_OBJECT(SkyLight);
public: