diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-01 00:17:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-01 00:19:38 +0300 |
| commit | 81f898f053d277a704c58031a56c261b974c36e2 (patch) | |
| tree | 19d15f0d27c30ed0002509e5ba807283a371bf98 /source/blender/blenlib | |
| parent | 60d6eb0b5d578eb02c5f1f31cb51a6cbeea6ee6f (diff) | |
| parent | a9bd788348484fb4a62654ea3ffa60ed24b94ff3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c index 38fe2c7a9eb..fca168dce69 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -167,9 +167,9 @@ char *BLI_cpu_brand_string(void) int result[4] = { 0 }; __cpuid(result, 0x80000000); if (result[0] >= (int)0x80000004) { - __cpuid((int*)(buf + 0), 0x80000002); - __cpuid((int*)(buf + 16), 0x80000003); - __cpuid((int*)(buf + 32), 0x80000004); + __cpuid((int *)(buf + 0), 0x80000002); + __cpuid((int *)(buf + 16), 0x80000003); + __cpuid((int *)(buf + 32), 0x80000004); char *brand = BLI_strdup(buf); /* TODO(sergey): Make it a bit more presentable by removing trademark. */ return brand; |