From 3df04851cfa0e2091c96c3aa10f1c6e8e1075016 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 26 Aug 2019 18:34:54 -0600 Subject: Cycles/Windows: Fix over estimation of System RAM. `system_physical_ram` reported 1024x more System RAM than what was actually available. --- intern/cycles/util/util_system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles') diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index 0cd991c6231..f700f9bd277 100644 --- a/intern/cycles/util/util_system.cpp +++ b/intern/cycles/util/util_system.cpp @@ -357,7 +357,7 @@ size_t system_physical_ram() MEMORYSTATUSEX ram; ram.dwLength = sizeof(ram); GlobalMemoryStatusEx(&ram); - return ram.ullTotalPhys * 1024; + return ram.ullTotalPhys; #elif defined(__APPLE__) uint64_t ram = 0; size_t len = sizeof(ram); -- cgit v1.2.3