Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-08-27 03:34:54 +0300
committerRay Molenkamp <github@lazydodo.com>2019-08-27 03:34:54 +0300
commit3df04851cfa0e2091c96c3aa10f1c6e8e1075016 (patch)
tree38df4d7c2cdb2330f182f5655f9339dcdeaa0c9f /intern
parentd9be59e872f8a112f31b73f07fe41efb51a08ad9 (diff)
Cycles/Windows: Fix over estimation of System RAM.
`system_physical_ram` reported 1024x more System RAM than what was actually available.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_system.cpp2
1 files changed, 1 insertions, 1 deletions
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);