From 46c3075258901cf22038aea78f15dfddcdbc30d0 Mon Sep 17 00:00:00 2001 From: sixtenhugosson Date: Tue, 26 Dec 2023 11:53:10 +0100 Subject: [PATCH] Fixed minor bug causing huge memory leak. --- code/core/core_memory.cpp | 2 +- code/vn_scene_view.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/core/core_memory.cpp b/code/core/core_memory.cpp index 499f599..df83f2b 100644 --- a/code/core/core_memory.cpp +++ b/code/core/core_memory.cpp @@ -175,7 +175,7 @@ static void ArenaPopTo(arena *Arena, u64 Position) arena *Target = Arena; for(int ArenaIndex = 0; ArenaIndex < Position/Arena->Size; ++ArenaIndex) { - Target = Arena->Next; + Target = Target->Next; } // sixten: deallocate all arenas that are no longer needed diff --git a/code/vn_scene_view.cpp b/code/vn_scene_view.cpp index 19fc7a1..87a28dc 100644 --- a/code/vn_scene_view.cpp +++ b/code/vn_scene_view.cpp @@ -346,8 +346,6 @@ static void SV_DrawBackground(scene_view *SceneView, ui_box *Box, render_group * render_handle Texture = TextureFromAssetID(SceneView->Runtime.Compiled.BackgroundTexture); //- sixten: render background - // sixten(TODO, but soon): Currently we add Box->Rect.Min to everything, but that should really be a transform - // on the render group. #if 0 persist r32 Time = 0; Time += 1 / 1200.0f; @@ -503,11 +501,11 @@ static ui_signal SV_BuildNavItem(scene_nav_item *Item, r32 GlobalScale, v2_r32 G UI_SetNextHoverCursor(PlatformCursor_Hand); ui_box *ItemBox = UI_MakeBoxF(UI_BoxFlag_Clickable|UI_BoxFlag_FloatingX|UI_BoxFlag_FloatingY, - "View Item Box %i %S %p", - (U32FromRawR32(Item->Scale)<<4)+ - (U32FromRawR32(Item->Origin.x)<<17)+ - (U32FromRawR32(Item->Origin.y)<<11), - Item->HoverText, Item); + "View Item Box %i %S %p", + (U32FromRawR32(Item->Scale)<<4)+ + (U32FromRawR32(Item->Origin.x)<<17)+ + (U32FromRawR32(Item->Origin.y)<<11), + Item->HoverText, Item); UI_EquipBoxCustomDrawCallback(ItemBox, BuildNavItemDrawCallback, Data); ui_signal Signal = UI_SignalFromBox(ItemBox);