Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
committerRay Molenkamp <github@lazydodo.com>
Thu, 19 Jul 2018 02:02:16 +0000 (20:02 -0600)
build_files/windows/detect_msvc_classic.cmd [new file with mode: 0644]
intern/cycles/kernel/kernel_types.h
source/blender/editors/interface/interface_eyedropper_color.c

diff --git a/build_files/windows/detect_msvc_classic.cmd b/build_files/windows/detect_msvc_classic.cmd
new file mode 100644 (file)
index 0000000..61bfcf9
--- /dev/null
@@ -0,0 +1,69 @@
+if NOT "%verbose%" == "" (
+       echo Detecting msvc %BUILD_VS_YEAR%
+)
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR (
+       if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% on Win64 detected at "%MSVC_VC_DIR%"
+       )
+       goto msvc_detect_finally
+)
+
+REM Check 32 bits
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR (
+       if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% on Win32 detected at "%MSVC_VC_DIR%"
+       )
+       goto msvc_detect_finally
+)
+if NOT "%verbose%" == "" (
+       echo Visual Studio %BUILD_VS_YEAR% not found. 
+)
+goto FAIL
+:msvc_detect_finally
+set VCVARS=%MSVC_VC_DIR%\vcvarsall.bat
+if not exist "%VCVARS%" (
+       echo "%VCVARS%" not found.
+       goto FAIL
+)
+
+call "%vcvars%" %BUILD_ARCH%
+
+rem try msbuild
+msbuild /version > NUL 
+if errorlevel 1 (
+       if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% msbuild not found
+       )
+       goto FAIL
+)
+
+if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% msbuild found 
+)
+
+REM try the c++ compiler
+cl 2> NUL 1>&2
+if errorlevel 1 (
+       if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found
+       )
+       goto FAIL
+)
+
+if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found
+)
+goto DetectionComplete
+
+:FAIL
+exit /b 1
+
+:DetectionComplete
+if NOT "%verbose%" == "" (
+               echo Visual Studio %BUILD_VS_YEAR% Detected successfuly 
+)
+exit /b 0
index 69ee66b3dd58dc05a7212b7c1b900b3e3b641068..855484848731396597d88cc5c256477fa739b1b5 100644 (file)
@@ -54,7 +54,7 @@ CCL_NAMESPACE_BEGIN
 #define PRIM_NONE                              (~0)
 #define LAMP_NONE                              (~0)
 
-#define VOLUME_STACK_SIZE              16
+#define VOLUME_STACK_SIZE              32
 
 /* Split kernel constants */
 #define WORK_POOL_SIZE_GPU 64
index ff8aa56f0d5a1e96e0ecf518cb714280a3b4ee12..bcce70d9d8a6df30ca2b20e26661003e292740ea 100644 (file)
@@ -297,7 +297,7 @@ static int eyedropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
        }
        else {
                eyedropper_exit(C, op);
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        }
 }
 
@@ -315,7 +315,7 @@ static int eyedropper_exec(bContext *C, wmOperator *op)
                return OPERATOR_FINISHED;
        }
        else {
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        }
 }