[Bf-blender-cvs] [3df04851cfa] master: Cycles/Windows: Fix over estimation of System RAM.
Ray Molenkamp
noreply at git.blender.org
Tue Aug 27 02:35:00 CEST 2019
Commit: 3df04851cfa0e2091c96c3aa10f1c6e8e1075016
Author: Ray Molenkamp
Date: Mon Aug 26 18:34:54 2019 -0600
Branches: master
https://developer.blender.org/rB3df04851cfa0e2091c96c3aa10f1c6e8e1075016
Cycles/Windows: Fix over estimation of System RAM.
`system_physical_ram` reported 1024x more System RAM than what
was actually available.
===================================================================
M intern/cycles/util/util_system.cpp
===================================================================
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);
More information about the Bf-blender-cvs
mailing list