Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 3 May 2017 21:55:29 +0000 (23:55 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 3 May 2017 21:55:29 +0000 (23:55 +0200)
intern/cycles/util/util_types.h
make.bat

index aacf7c1bd8ec31f05760490a646e0c86c9a83b81..feab7996aee126faae31983a4e3fa9030ce43eca 100644 (file)
@@ -94,6 +94,7 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_OPENCL__
 typedef unsigned char uchar;
 typedef unsigned int uint;
+typedef unsigned short ushort;
 #endif
 
 /* Fixed Bits Types */
index ba5832f9524cd1b1f581fc1ca9d38bb463366b5d..4abcd086cdfad68dcba3cbc969fd713cd44372ef 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -257,7 +257,7 @@ echo msbuild ^
        %BUILD_DIR%\Blender.sln ^
        /target:build ^
        /property:Configuration=%BUILD_TYPE% ^
-       /maxcpucount ^
+       /maxcpucount:2 ^
        /verbosity:minimal ^
        /p:platform=%MSBUILD_PLATFORM% ^
        /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log >> %BUILD_DIR%\rebuild.cmd
@@ -273,7 +273,7 @@ msbuild ^
        %BUILD_DIR%\Blender.sln ^
        /target:build ^
        /property:Configuration=%BUILD_TYPE% ^
-       /maxcpucount ^
+       /maxcpucount:2 ^
        /verbosity:minimal ^
        /p:platform=%MSBUILD_PLATFORM% ^
        /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log