Merge branch 'main' into 270-add-palette-editor

GameDevTecnico · Oct 16, 2023 · f1bb0d1 · f1bb0d1
2 parents 3e33722 + 174a787
commit f1bb0d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/engine/include/cubos/engine/renderer/plugin.hpp b/engine/include/cubos/engine/renderer/plugin.hpp
@@ -95,7 +95,7 @@ namespace cubos::engine
         Asset<VoxelPalette> asset;
 
         /// @brief Previous asset handle save in order to check if asset changed later.
-        /// TODO: ECS should have a .changed function to make this process easier (#273).
+        /// @todo ECS should have a .changed function to make this process easier (#273).
         Asset<VoxelPalette> prev;
     };
 

diff --git a/engine/src/cubos/engine/renderer/plugin.cpp b/engine/src/cubos/engine/renderer/plugin.cpp
@@ -111,8 +111,8 @@ static void checkPaletteUpdateSystem(Write<Assets> assets, Write<Renderer> rende
 
     if (assets->update(activePalette->asset) || activePalette->prev != activePalette->asset)
     {
-        auto palette = assets->read(activePalette->asset).get();
-        (*renderer)->setPalette(palette);
+        auto paletteRead = assets->read(activePalette->asset);
+        (*renderer)->setPalette(*paletteRead);
         activePalette->prev = activePalette->asset;
     }
 }