Merge branch 'master' into 1.5

# Conflicts: # Source/Engine/Serialization/Stream.cpp
2022-11-21 15:51:57 +01:00
parent 1dfea17bce b139ebfe88
commit 93c0dd704e
62 changed files with 391 additions and 351 deletions
--- a/Source/Engine/Level/Actors/DirectionalLight.h
+++ b/Source/Engine/Level/Actors/DirectionalLight.h
@@ -7,7 +7,7 @@
 /// <summary>
 /// Directional light emits light from direction in space.
 /// </summary>
-API_CLASS() class FLAXENGINE_API DirectionalLight : public LightWithShadow
+API_CLASS(Attributes="ActorContextMenu(\"New/Lights/Directional Light\")") class FLAXENGINE_API DirectionalLight : public LightWithShadow
 {
    DECLARE_SCENE_OBJECT(DirectionalLight);
 public: