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

# Conflicts: # Source/Engine/Particles/Particles.cpp
2025-07-14 18:35:53 +02:00
parent a1e4ed05c4 10e9aee8ce
commit 349547f66c
17 changed files with 394 additions and 119 deletions
--- a/Source/Engine/Particles/ParticleEffect.cpp
+++ b/Source/Engine/Particles/ParticleEffect.cpp
@@ -587,10 +587,19 @@ void ParticleEffect::OnDebugDrawSelected()
 {
    DEBUG_DRAW_WIRE_BOX(_box, Color::Violet * 0.7f, 0, true);

-    // Base
    Actor::OnDebugDrawSelected();
 }

+void ParticleEffect::OnDebugDraw()
+{
+    if (ShowDebugDraw)
+    {
+        Particles::DebugDraw(this);
+    }
+
+    Actor::OnDebugDraw();
+}
+
 #endif

 void ParticleEffect::OnLayerChanged()