Commit: 9a74b603670cc3fab14d9fcd7be7b3c17731a8ee
Author: Campbell Barton
Date: Sun May 27 11:06:29 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9a74b603670cc3fab14d9fcd7be7b3c17731a8ee
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc make.bat
index d00a9ecf711,577f820438b..3e2217d010a
--- a/make.bat
+++ b/make.bat
@@@ -237,126 -42,28 +42,28 @@@ if "%BUILD_VS_YEAR%" == ""
)
)
- if NOT EXIST %BUILD_VS_LIBDIR% (
- echo Error: Path to libraries not found "%BUILD_VS_LIBDIR%"
- echo This is needed for building, aborting!
- goto EOF
- )
+ call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd"
- if "%TARGET%"=="" (
- echo Error: Convenience target not set
- echo This is required for building, aborting!
- echo .
- goto HELP
- )
+ echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR%
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER%
%BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS%
- if NOT EXIST %BUILD_DIR%\nul (
- mkdir %BUILD_DIR%
- )
- if "%MUST_CLEAN%"=="1" (
- echo Cleaning %BUILD_DIR%
- msbuild ^
- %BUILD_DIR%\Blender.sln ^
- /target:clean ^
- /property:Configuration=%BUILD_TYPE% ^
- /verbosity:minimal ^
- /p:platform=%MSBUILD_PLATFORM%
+ call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
+ if errorlevel 1 goto EOF
- if %ERRORLEVEL% NEQ 0 (
- echo Cleaned "%BUILD_DIR%"
- )
- goto EOF
- )
- REM Only configure on first run or when called with nobuild
- if NOT EXIST %BUILD_DIR%\Blender.sln set MUST_CONFIGURE=1
- if "%NOBUILD%"=="1" set MUST_CONFIGURE=1
-
- if "%MUST_CONFIGURE%"=="1" (
- cmake ^
- %BUILD_CMAKE_ARGS% ^
- -H%BLENDER_DIR% ^
- -B%BUILD_DIR% ^
- %BUILD_CMAKE_ARGS%
-
- if %ERRORLEVEL% NEQ 0 (
- echo "Configuration Failed"
- goto EOF
- )
- )
- if DEFINED MSVC_VC_DIR echo call "%MSVC_VC_DIR%\vcvarsall.bat" >
%BUILD_DIR%\rebuild.cmd
- if DEFINED MSVC_VS_DIR echo call "%MSVC_VS_DIR%\Common7\Tools\VsDevCmd.bat" >
%BUILD_DIR%\rebuild.cmd
- echo cmake . >> %BUILD_DIR%\rebuild.cmd
- echo msbuild ^
- %BUILD_DIR%\Blender.sln ^
- /target:build ^
- /property:Configuration=%BUILD_TYPE% ^
- /maxcpucount:2 ^
- /verbosity:minimal ^
- /p:platform=%MSBUILD_PLATFORM% ^
- /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log >>
%BUILD_DIR%\rebuild.cmd
- echo msbuild ^
- %BUILD_DIR%\INSTALL.vcxproj ^
- /property:Configuration=%BUILD_TYPE% ^
- /verbosity:minimal ^
- /p:platform=%MSBUILD_PLATFORM% >> %BUILD_DIR%\rebuild.cmd
+ call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
+ if errorlevel 1 goto EOF
- if "%NOBUILD%"=="1" goto EOF
+ if "%BUILD_WITH_NINJA%" == "" (
+ call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd"
+ if errorlevel 1 goto EOF
- msbuild ^
- %BUILD_DIR%\Blender.sln ^
- /target:build ^
- /property:Configuration=%BUILD_TYPE% ^
- /maxcpucount:2 ^
- /verbosity:minimal ^
- /p:platform=%MSBUILD_PLATFORM% ^
- /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log
+ call "%BLENDER_DIR%\build_files\windows\build_msbuild.cmd"
+ if errorlevel 1 goto EOF
+ ) else (
+ call "%BLENDER_DIR%\build_files\windows\configure_ninja.cmd"
+ if errorlevel 1 goto EOF
- if %ERRORLEVEL% NEQ 0 (
- echo "Build Failed"
- goto EOF
+ call "%BLENDER_DIR%\build_files\windows\build_ninja.cmd"
+ if errorlevel 1 goto EOF
)
- msbuild ^
- %BUILD_DIR%\INSTALL.vcxproj ^
- /property:Configuration=%BUILD_TYPE% ^
- /verbosity:minimal ^
- /p:platform=%MSBUILD_PLATFORM%
-
- echo.
- echo At any point you can optionally modify your build configuration by
editing:
- echo "%BUILD_DIR%\CMakeCache.txt", then run "rebuild.cmd" in the build folder
to build with the changes applied.
- echo.
- echo Blender successfully built, run from:
"%BUILD_DIR%\bin\%BUILD_TYPE%\blender.exe"
- echo.
- goto EOF
- :HELP
- echo.
- echo Convenience targets
- echo - release ^(identical to the official blender.org builds^)
- echo - full ^(same as release minus the cuda kernels^)
- echo - lite
- echo - headless
- echo - cycles
- echo - bpy
- echo.
- echo Utilities ^(not associated with building^)
- echo - clean ^(Target must be set^)
- echo - update
- echo - nobuild ^(only generate project files^)
- echo - showhash ^(Show git hashes of source tree^)
- echo.
- echo Configuration options
- echo - with_tests ^(enable building unit tests^)
- echo - noge ^(disable building game enginge and player^)
- echo - debug ^(Build an unoptimized debuggable build^)
- echo - packagename [newname] ^(override default cpack package name^)
- echo - buildir [newdir] ^(override default build folder^)
- echo - x86 ^(override host auto-detect and build 32 bit code^)
- echo - x64 ^(override host auto-detect and build 64 bit code^)
- echo - 2013 ^(build with visual studio 2013^)
- echo - 2015 ^(build with visual studio 2015^) [EXPERIMENTAL]
- echo - 2017 ^(build with visual studio 2017^) [EXPERIMENTAL]
- echo.
-
-:EOF
+:EOF
diff --cc release/scripts/startup/nodeitems_builtins.py
index 591180f08b4,60a8471ca3b..d60710db4aa
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -229,8 -259,9 +229,9 @@@ shader_node_categories =
NodeItem("ShaderNodeTexChecker"),
NodeItem("ShaderNodeTexBrick"),
NodeItem("ShaderNodeTexPointDensity"),
+ NodeItem("ShaderNodeTexIES"),
]),
- ShaderNewNodeCategory("SH_NEW_OP_COLOR", "Color", items=[
+ ShaderNodeCategory("SH_NEW_OP_COLOR", "Color", items=[
NodeItem("ShaderNodeMixRGB"),
NodeItem("ShaderNodeRGBCurve"),
NodeItem("ShaderNodeInvert"),
diff --cc source/blender/blenkernel/BKE_node.h
index f3cbcd7b99f,150f0818cb8..c654dd51e2a
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -796,7 -789,7 +796,8 @@@ void BKE_nodetree_remove_layer_n(struc
#define SH_NODE_UVALONGSTROKE 191
#define SH_NODE_TEX_POINTDENSITY 192
#define SH_NODE_BSDF_PRINCIPLED 193
+ #define SH_NODE_TEX_IES 194
+#define SH_NODE_EEVEE_SPECULAR 195
#define SH_NODE_BEVEL 197
#define SH_NODE_DISPLACEMENT 198
#define SH_NODE_VECTOR_DISPLACEMENT 199
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
