diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-27 10:22:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 10:22:09 +0200 |
| commit | 8a21f7231f0851aec4c06abee28a549b1f8083fd (patch) | |
| tree | ad19b0a7c4258434180049336f093f4573e81c7d | |
| parent | 92b337a215616d619797bbe2ff53901fa1f116d8 (diff) | |
| parent | 7b71545652f78439f56d512210b52d5e803c43c1 (diff) | |
Merge pull request #61441 from clayjohn/rd-dependency
Remove mesh and particles RD dependencies from canvas rendering server
| -rw-r--r-- | servers/rendering/renderer_canvas_render.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_canvas_render.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/servers/rendering/renderer_canvas_render.cpp b/servers/rendering/renderer_canvas_render.cpp index 49417bd3a6..163a24247e 100644 --- a/servers/rendering/renderer_canvas_render.cpp +++ b/servers/rendering/renderer_canvas_render.cpp @@ -95,7 +95,7 @@ const Rect2 &RendererCanvasRender::Item::get_rect() const { case Item::Command::TYPE_PARTICLES: { const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c); if (particles_cmd->particles.is_valid()) { - AABB aabb = RendererRD::ParticlesStorage::get_singleton()->particles_get_aabb(particles_cmd->particles); + AABB aabb = RSG::particles_storage->particles_get_aabb(particles_cmd->particles); r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y); } diff --git a/servers/rendering/renderer_canvas_render.h b/servers/rendering/renderer_canvas_render.h index 9da022341c..1724a99b20 100644 --- a/servers/rendering/renderer_canvas_render.h +++ b/servers/rendering/renderer_canvas_render.h @@ -31,8 +31,6 @@ #ifndef RENDERINGSERVERCANVASRENDER_H #define RENDERINGSERVERCANVASRENDER_H -#include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h" -#include "servers/rendering/renderer_rd/storage_rd/particles_storage.h" #include "servers/rendering/renderer_storage.h" class RendererCanvasRender { |