[Bf-blender-cvs] [b9f61eb874f] master: Cycles: Fix Architecture logging on x64.
Commit: b9f61eb874f02bfddc42e5ce376fec7e71cb84b3
Author: Lazydodo
Date: Mon Aug 26 07:22:44 2019 -0600
Branches: master
https://developer.blender.org/rBb9f61eb874f02bfddc42e5ce376fec7e71cb84b3
Cycles: Fix Architecture logging on x64.
x64 builds with WITH_CYCLES_OPTIMIZED_KERNEL_SSE2 not defined
since SSE2 is the lower bar for x64 cpus. Turning the architecture
logging related if into the last if in the architecture detection
chain, which will never execute unless you turn off all kernels
in de debug flags.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D5579
===
M intern/cycles/device/device_cpu.cpp
===
diff --git a/intern/cycles/device/device_cpu.cpp
b/intern/cycles/device/device_cpu.cpp
index b2d923dfdf0..c2843a61e6d 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -114,6 +114,12 @@ template class KernelFunctions {
architecture_name = "SSE2";
kernel = kernel_sse2;
}
+#else
+{
+ /* Dummy to prevent the architecture if below become
+ * conditional when WITH_CYCLES_OPTIMIZED_KERNEL_SSE2
+ * is not defined. */
+}
#endif
if (strcmp(architecture_name, logged_architecture) != 0) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5888a2283e0] master: Cmake/MSVC: Enable Edit and Continue for debug builds.
Commit: 5888a2283e0b47f2a8991d2548eb8e4d4c156dea
Author: Lazydodo
Date: Thu Aug 22 10:20:40 2019 -0600
Branches: master
https://developer.blender.org/rB5888a2283e0b47f2a8991d2548eb8e4d4c156dea
Cmake/MSVC: Enable Edit and Continue for debug builds.
This change switches the debug symbol format from /Zi to /ZI for
debug builds of blender, allowing Edit and Continue to work.
This allows limited [1] code changes in the debugger without
having to stop the process and recompile a new binary leading
to improved developer productivity.
All MSVC versions we support support this flag, Clang on
windows does not mind the /ZI flag, but doesn't currently
emit the required information to have this feature work.
[1]
https://docs.microsoft.com/en-us/visualstudio/debugger/supported-code-changes-cpp
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 42ac285f88d..b2277c440fe 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -135,8 +135,8 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
endif()
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /ZI")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd /ZI")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [6086a6d9399] master: Cleanup: Fix build error with MSVC
Commit: 6086a6d9399e42c3e88b39e5658af9a2ed06cac5
Author: Lazydodo
Date: Wed Aug 21 10:38:33 2019 -0600
Branches: master
https://developer.blender.org/rB6086a6d9399e42c3e88b39e5658af9a2ed06cac5
Cleanup: Fix build error with MSVC
Previously eigens internal include order somehow implicitly provided
M_PI and friends. The recent eigen version bump broke this implicit
behaviour, better to be explicit that we need the math defines for MSVC.
===
M intern/iksolver/CMakeLists.txt
M intern/libmv/CMakeLists.txt
M intern/libmv/libmv/tracking/track_region.cc
M intern/libmv/libmv/tracking/track_region.h
===
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 5e12cdbcc2f..a7a346ccddd 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -27,6 +27,10 @@ set(INC_SYS
${EIGEN3_INCLUDE_DIRS}
)
+if(WIN32)
+ add_definitions(-D_USE_MATH_DEFINES)
+endif()
+
set(SRC
intern/IK_QJacobian.cpp
intern/IK_QJacobianSolver.cpp
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 019364d84df..e16e27368d0 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -38,6 +38,9 @@ set(LIB
)
if(WITH_LIBMV)
+ if(WIN32)
+add_definitions(-D_USE_MATH_DEFINES)
+ endif()
add_definitions(${GFLAGS_DEFINES})
add_definitions(${GLOG_DEFINES})
add_definitions(${CERES_DEFINES})
diff --git a/intern/libmv/libmv/tracking/track_region.cc
b/intern/libmv/libmv/tracking/track_region.cc
index ef6dac65236..895c9a1e23d 100644
--- a/intern/libmv/libmv/tracking/track_region.cc
+++ b/intern/libmv/libmv/tracking/track_region.cc
@@ -25,9 +25,6 @@
// smart coder went through the TODO's and made the suggested performance
// enhancements.
-// Necessary for M_E when building with MSVC.
-#define _USE_MATH_DEFINES
-
#include "libmv/tracking/track_region.h"
#include
diff --git a/intern/libmv/libmv/tracking/track_region.h
b/intern/libmv/libmv/tracking/track_region.h
index be1d8ef3e03..61dce22bcb8 100644
--- a/intern/libmv/libmv/tracking/track_region.h
+++ b/intern/libmv/libmv/tracking/track_region.h
@@ -20,9 +20,6 @@
#ifndef LIBMV_TRACKING_TRACK_REGION_H_
-// Necessary for M_E when building with MSVC.
-#define _USE_MATH_DEFINES
-
#include "libmv/image/image.h"
#include "libmv/image/sample.h"
#include "libmv/numeric/numeric.h"
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1548682cde8] soc-2019-openxr: Windows/deps: Add/fix openxr_sdk dependency
Commit: 1548682cde8f0a4835359cc02183edf780f9f5ee
Author: Lazydodo
Date: Tue Aug 20 08:30:29 2019 -0600
Branches: soc-2019-openxr
https://developer.blender.org/rB1548682cde8f0a4835359cc02183edf780f9f5ee
Windows/deps: Add/fix openxr_sdk dependency
There were a few typos here and there, and the openxr_sdk does not respect the
cflags we give it hence a patch was added to work around this undesirable
behaviour.
===
M build_files/build_environment/cmake/openxr.cmake
M build_files/build_environment/cmake/versions.cmake
A build_files/build_environment/patches/openxr_sdk.diff
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/build_environment/cmake/openxr.cmake
b/build_files/build_environment/cmake/openxr.cmake
index 001527c78f1..bf6c068bfc5 100644
--- a/build_files/build_environment/cmake/openxr.cmake
+++ b/build_files/build_environment/cmake/openxr.cmake
@@ -36,19 +36,17 @@ ExternalProject_Add(external_openxr_sdk
INSTALL_DIR ${LIBDIR}/openxr_sdk
)
-add_dependencies(external_openxr_sdk)
-
if(WIN32)
if(BUILD_MODE STREQUAL Release)
ExternalProject_Add_Step(external_openxr_sdk after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/openxr_sdk/include/openxr ${HARVEST_TARGET}/openxr_sdk/include/openxr
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/openxr_sdk/lib/openxr_loader-*.lib
${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader-*.lib
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openxr_sdk/lib
${HARVEST_TARGET}/openxr_sdk/lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_openxr_sdk after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/openxr_sdk/lib/openxr_loader-*.lib
${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader-*.lib
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/openxr_sdk/lib/openxr_loader-1_0.lib
${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader-1_0_d.lib
DEPENDEES install
)
endif()
diff --git a/build_files/build_environment/cmake/versions.cmake
b/build_files/build_environment/cmake/versions.cmake
index f73d492f574..862327d83ac 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -308,5 +308,5 @@ set(OIDN_URI
https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_
set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)
set(OPENXR_SDK_VERSION 1.0.0)
-set(OPENXR_SDK_URI
https://github.com/KhronosGroup/OpenXR-SDK-Source/archive/release-${OPENXR_VERSION}.tar.gz)
-set(OPENXR_SDK_HASH 348912bf9bfaf445ac2974bda19fd0d50496460b)
+set(OPENXR_SDK_URI
https://github.com/KhronosGroup/OpenXR-SDK-Source/archive/release-${OPENXR_SDK_VERSION}.tar.gz)
+set(OPENXR_SDK_HASH 260bdc87b5a9b7ef35a540e39f875d79)
diff --git a/build_files/build_environment/patches/openxr_sdk.diff
b/build_files/build_environment/patches/openxr_sdk.diff
new file mode 100644
index 000..4239fba4f16
--- /dev/null
+++ b/build_files/build_environment/patches/openxr_sdk.diff
@@ -0,0 +1,28 @@
+diff -Naur orig/src/loader/CMakeLists.txt
external_openxr_sdk/src/loader/CMakeLists.txt
+--- orig/src/loader/CMakeLists.txt 2019-07-29 07:06:59 -0600
external_openxr_sdk/src/loader/CMakeLists.txt 2019-08-20 07:56:51
-0600
+@@ -128,24 +128,6 @@
+ configure_file("openxr.pc.in" "openxr.pc" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openxr.pc" DESTINATION
"${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+-foreach(configuration in CMAKE_C_FLAGS_DEBUG
+- CMAKE_C_FLAGS_RELEASE
+- CMAKE_C_FLAGS_RELWITHDEBINFO
+- CMAKE_CXX_FLAGS_DEBUG
+- CMAKE_CXX_FLAGS_RELEASE
+- CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+-# If building DLLs, force static CRT linkage
+-if(DYNAMIC_LOADER)
+-if (${configuration} MATCHES "/MD")
+-string(REGEX REPLACE "/MD" "/MT" ${configuration}
"${${configuration}}")
+-endif()
+-else() # Otherwise for static libs, link the CRT dynamically
+-if (${configuration} MATCHES "/MT")
+-string(REGEX REPLACE "/MT" "/MD" ${configuration}
"${${configuration}}")
+-endif()
+-endif()
+-endforeach()
+-
+ target_link_libraries(${LOADER_NAME} shlwapi)
+ target_compile_options(${LOADER_NAME} PRIVATE)
+ generate_export_header(${LOADER_NAME})
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 32a0dd1e383..46a58664b34 100644
--- a/build_
[Bf-blender-cvs] [ea8e0df6727] master: Fix T55054: possible use of unsupported instructions in Cycles texture code
Commit: ea8e0df672713a7b3ff408242c940e1f5e78c9c1
Author: Lazydodo
Date: Fri Aug 16 16:27:15 2019 +0200
Branches: master
https://developer.blender.org/rBea8e0df672713a7b3ff408242c940e1f5e78c9c1
Fix T55054: possible use of unsupported instructions in Cycles texture code
Differential Revision: https://developer.blender.org/D5326
===
M intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
===
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
index 4289e2bbb85..8f311baf010 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
@@ -19,6 +19,10 @@
CCL_NAMESPACE_BEGIN
+/* Make template functions private so symbols don't conflict between kernels
with different
+ * instruction sets. */
+namespace {
+
template struct TextureInterpolator {
#define SET_CUBIC_SPLINE_WEIGHTS(u, t) \
{ \
@@ -523,6 +527,8 @@ ccl_device float4 kernel_tex_image_interp_3d(
}
}
+} /* Namespace. */
+
CCL_NAMESPACE_END
#endif // __KERNEL_CPU_IMAGE_H__
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f1bc61e1e4a] temp-lanpr-staging: Windows/MSI: Rework MSI installer.
Commit: f1bc61e1e4a87ccbf3adc23a0355e96d0f3ab4f7
Author: Lazydodo
Date: Thu Aug 15 13:43:27 2019 -0600
Branches: temp-lanpr-staging
https://developer.blender.org/rBf1bc61e1e4a87ccbf3adc23a0355e96d0f3ab4f7
Windows/MSI: Rework MSI installer.
The installer always upgraded the last version installed and did not allow for
two versions to be installed side by side.
The reworked installer will allow side by side installs
install order:
```
2.81 -> 2.81a -> 2.82 : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81a -> 2.81 : Not Allowed, 2.81 will only install if you manually
remove 2.81a first.
```
Do note though that this will not apply to any previously issued installers and
even for 2.80a this is not something we can fix.
This patch is for landing in 2.81 *only* and should be excluded from any
possible 2.80a release.
Second change is a change to the compression level, building the MSI takes 30
minutes, which is crazy, perhaps worth it if the compression actually pays of.
```
MSI - none 1:35 247.0 MB (260,025,634 bytes)
MSI - mszip2:02 89.6 MB ( 94,022,946 bytes)
MSI - low 2:35 81.6 MB ( 85,646,626 bytes)
MSI - medium 4:11 77.3 MB ( 81,136,930 bytes)
MSI - high28:01 74.7 MB ( 78,384,418 bytes)
zip1:32 93.2 MB ( 97,732,293 bytes)
7Z 2:22 65.0 MB ( 68,171,614 bytes)
```
It didn't, so I lowered it to medium, seemed reasonable.
Differential Revision: https://developer.blender.org/D5494
Reviewers: brecht, jesterking
===
M build_files/cmake/packaging.cmake
===
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index 06a97fc9abb..5ace42646c5 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -80,22 +80,28 @@ if(APPLE)
endif()
if(WIN32)
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
- set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender
${MAJOR_VERSION}.${MINOR_VERSION}")
+ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender
${MAJOR_VERSION}.${MINOR_VERSION}")
set(CPACK_NSIS_MUI_ICON
${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
set(CPACK_RESOURCE_FILE_LICENSE
${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
set(CPACK_WIX_PRODUCT_ICON
${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
- set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
+
+ set(BLENDER_NAMESPACE_GUID "507F933F-5898-404A-9A05-18282FD491A6")
+
+ string(UUID CPACK_WIX_UPGRADE_GUID
+NAMESPACE ${BLENDER_NAMESPACE_GUID}
+NAME ${CPACK_PACKAGE_INSTALL_DIRECTORY}
+TYPE SHA1 UPPER
+ )
set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
- #force lzma instead of deflate
- set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
+ set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
endif()
set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9ba7255e743] temp-lanpr-staging: Windows: add cycles debug logging to helper batch file.
Commit: 9ba7255e743d146044a938f8a4d0fb828f49676a Author: Lazydodo Date: Thu Aug 15 09:42:00 2019 -0600 Branches: temp-lanpr-staging https://developer.blender.org/rB9ba7255e743d146044a938f8a4d0fb828f49676a Windows: add cycles debug logging to helper batch file. === M release/windows/batch/blender_debug_log.cmd === diff --git a/release/windows/batch/blender_debug_log.cmd b/release/windows/batch/blender_debug_log.cmd index ecb5803a5c9..2d708ea9104 100644 --- a/release/windows/batch/blender_debug_log.cmd +++ b/release/windows/batch/blender_debug_log.cmd @@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit set PYTHONPATH= -blender --debug --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 +blender --debug --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 explorer "%temp%\blender\debug_logs" ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [4ba9f580327] temp-lanpr-staging: Fix T56843 : fix case sensitive filenames on win10
Commit: 4ba9f5803270a9c2246a38b7bcdddea66d38a529
Author: Lazydodo
Date: Thu Aug 15 09:27:15 2019 -0600
Branches: temp-lanpr-staging
https://developer.blender.org/rB4ba9f5803270a9c2246a38b7bcdddea66d38a529
Fix T56843 : fix case sensitive filenames on win10
When building with case sensitive folders there were some linker errors.
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 80097e6c84f..42ac285f88d 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -418,7 +418,7 @@ endif()
if(WITH_OPENIMAGEIO)
windows_find_package(OpenImageIO)
- set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib
optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
@@ -459,14 +459,14 @@ if(WITH_LLVM)
endif()
if(WITH_OPENCOLORIO)
- set(OPENCOLORIO ${LIBDIR}/opencolorio)
+ set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
- set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
+ set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
set(OPENCOLORIO_LIBRARIES
optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-debug ${OPENCOLORIO_LIBPATH}/OpenColorIO_d.lib
+debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
debug ${OPENCOLORIO_LIBPATH}/tinyxml_d.lib
debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
)
@@ -477,8 +477,8 @@ if(WITH_OPENVDB)
set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug
${LIBDIR}/blosc/lib/libblosc_d.lib)
set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug
${LIBDIR}/tbb/lib/tbb_debug.lib)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
- set(OPENVDB ${LIBDIR}/openvdb)
- set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
+ set(OPENVDB ${LIBDIR}/openVDB)
+ set(OPENVDB_LIBPATH ${OPENVDB}/lib)
set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug
${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
set(OPENVDB_DEFINITIONS -DNOMINMAX)
@@ -502,7 +502,7 @@ if(WITH_ALEMBIC)
set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
- set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/alembic.lib debug
${ALEMBIC}/lib/alembic_d.lib)
+ set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/Alembic.lib debug
${ALEMBIC}/lib/Alembic_d.lib)
set(ALEMBIC_FOUND 1)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [50ad4428ac7] master: Windows/MSI: Rework MSI installer.
Commit: 50ad4428ac76705dc28e4cd85272a47118b6a654
Author: Lazydodo
Date: Thu Aug 15 13:43:27 2019 -0600
Branches: master
https://developer.blender.org/rB50ad4428ac76705dc28e4cd85272a47118b6a654
Windows/MSI: Rework MSI installer.
The installer always upgraded the last version installed and did not allow for
two versions to be installed side by side.
The reworked installer will allow side by side installs
install order:
```
2.81 -> 2.81a -> 2.82 : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being
installed
2.82 -> 2.81a -> 2.81 : Not Allowed, 2.81 will only install if you manually
remove 2.81a first.
```
Do note though that this will not apply to any previously issued installers and
even for 2.80a this is not something we can fix.
This patch is for landing in 2.81 *only* and should be excluded from any
possible 2.80a release.
Second change is a change to the compression level, building the MSI takes 30
minutes, which is crazy, perhaps worth it if the compression actually pays of.
```
MSI - none 1:35 247.0 MB (260,025,634 bytes)
MSI - mszip2:02 89.6 MB ( 94,022,946 bytes)
MSI - low 2:35 81.6 MB ( 85,646,626 bytes)
MSI - medium 4:11 77.3 MB ( 81,136,930 bytes)
MSI - high28:01 74.7 MB ( 78,384,418 bytes)
zip1:32 93.2 MB ( 97,732,293 bytes)
7Z 2:22 65.0 MB ( 68,171,614 bytes)
```
It didn't, so I lowered it to medium, seemed reasonable.
Differential Revision: https://developer.blender.org/D5494
Reviewers: brecht, jesterking
===
M build_files/cmake/packaging.cmake
===
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index 06a97fc9abb..5ace42646c5 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -80,22 +80,28 @@ if(APPLE)
endif()
if(WIN32)
- set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
- set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender
${MAJOR_VERSION}.${MINOR_VERSION}")
+ set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender
${MAJOR_VERSION}.${MINOR_VERSION}")
set(CPACK_NSIS_MUI_ICON
${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
set(CPACK_RESOURCE_FILE_LICENSE
${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
set(CPACK_WIX_PRODUCT_ICON
${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
- set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
+
+ set(BLENDER_NAMESPACE_GUID "507F933F-5898-404A-9A05-18282FD491A6")
+
+ string(UUID CPACK_WIX_UPGRADE_GUID
+NAMESPACE ${BLENDER_NAMESPACE_GUID}
+NAME ${CPACK_PACKAGE_INSTALL_DIRECTORY}
+TYPE SHA1 UPPER
+ )
set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
- #force lzma instead of deflate
- set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
+ set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
endif()
set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [8856c26fc36] master: Windows: add cycles debug logging to helper batch file.
Commit: 8856c26fc364b4590755dacf132abe5ae7dac543 Author: Lazydodo Date: Thu Aug 15 09:42:00 2019 -0600 Branches: master https://developer.blender.org/rB8856c26fc364b4590755dacf132abe5ae7dac543 Windows: add cycles debug logging to helper batch file. === M release/windows/batch/blender_debug_log.cmd === diff --git a/release/windows/batch/blender_debug_log.cmd b/release/windows/batch/blender_debug_log.cmd index ecb5803a5c9..2d708ea9104 100644 --- a/release/windows/batch/blender_debug_log.cmd +++ b/release/windows/batch/blender_debug_log.cmd @@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1 echo. echo Starting blender and waiting for it to exit set PYTHONPATH= -blender --debug --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 +blender --debug --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0 explorer "%temp%\blender\debug_logs" ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9684971addf] master: Fix T56843 : fix case sensitive filenames on win10
Commit: 9684971addf0dfa43fb7367d9102460e8093c523
Author: Lazydodo
Date: Thu Aug 15 09:27:15 2019 -0600
Branches: master
https://developer.blender.org/rB9684971addf0dfa43fb7367d9102460e8093c523
Fix T56843 : fix case sensitive filenames on win10
When building with case sensitive folders there were some linker errors.
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 80097e6c84f..42ac285f88d 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -418,7 +418,7 @@ endif()
if(WITH_OPENIMAGEIO)
windows_find_package(OpenImageIO)
- set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib
optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
@@ -459,14 +459,14 @@ if(WITH_LLVM)
endif()
if(WITH_OPENCOLORIO)
- set(OPENCOLORIO ${LIBDIR}/opencolorio)
+ set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
- set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
+ set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
set(OPENCOLORIO_LIBRARIES
optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-debug ${OPENCOLORIO_LIBPATH}/OpenColorIO_d.lib
+debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
debug ${OPENCOLORIO_LIBPATH}/tinyxml_d.lib
debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
)
@@ -477,8 +477,8 @@ if(WITH_OPENVDB)
set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug
${LIBDIR}/blosc/lib/libblosc_d.lib)
set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug
${LIBDIR}/tbb/lib/tbb_debug.lib)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
- set(OPENVDB ${LIBDIR}/openvdb)
- set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
+ set(OPENVDB ${LIBDIR}/openVDB)
+ set(OPENVDB_LIBPATH ${OPENVDB}/lib)
set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug
${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
set(OPENVDB_DEFINITIONS -DNOMINMAX)
@@ -502,7 +502,7 @@ if(WITH_ALEMBIC)
set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
- set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/alembic.lib debug
${ALEMBIC}/lib/alembic_d.lib)
+ set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/Alembic.lib debug
${ALEMBIC}/lib/Alembic_d.lib)
set(ALEMBIC_FOUND 1)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f4d548d384e] master: msvc: Enable /bigobj on all object files.
Commit: f4d548d384e20ef377b2573a6c54a2434c3f9134
Author: Lazydodo
Date: Wed Aug 14 17:57:01 2019 -0600
Branches: master
https://developer.blender.org/rBf4d548d384e20ef377b2573a6c54a2434c3f9134
msvc: Enable /bigobj on all object files.
bf_intern_openvdb makes a significant number of template instantiations
causing it go over the maximum number of sections (int16) in a coff file
when doing a debug build.
This change switches the compiler to use the extended coff format which
has this field extended (int32) all linkers post msvc2005 can process
this format so there's no reason not to turn this on globally.
Clang on windows does not need this change since clang switches implicitly
to the extended format when required. [1]
[1] https://reviews.llvm.org/rL217812
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 208521a9e65..80097e6c84f 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -131,8 +131,8 @@ if(MSVC_CLANG) # Clangs version of cl doesn't support all
flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARN_FLAGS} /nologo /J /Gd
/EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd
-Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc /bigobj")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
@@ -349,7 +349,7 @@ if(WITH_PYTHON)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
set(PYTHON_LIBRARY
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.lib)
set(PYTHON_LIBRARY_DEBUG
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.lib)
-
+
set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include)
set(PYTHON_NUMPY_INCLUDE_DIRS
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include)
set(NUMPY_FOUND On)
@@ -490,7 +490,7 @@ if(WITH_OPENIMAGEDENOISE)
set(OPENIMAGEDENOISE ${LIBDIR}/OpenImageDenoise)
set(OPENIMAGEDENOISE_LIBPATH ${LIBDIR}/OpenImageDenoise/lib)
set(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE}/include
${TBB_INCLUDE_DIR})
- set(OPENIMAGEDENOISE_LIBRARIES
+ set(OPENIMAGEDENOISE_LIBRARIES
optimized ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise.lib
${OPENIMAGEDENOISE_LIBPATH}/common.lib ${OPENIMAGEDENOISE_LIBPATH}/mkldnn.lib
debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib
${OPENIMAGEDENOISE_LIBPATH}/common_d.lib
${OPENIMAGEDENOISE_LIBPATH}/mkldnn_d.lib
${TBB_LIBRARIES})
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1845f0ee8b3] master: Cleanup: Fix build error with MSVC
Commit: 1845f0ee8b33698ddd48c2204ad4084a77ab
Author: Lazydodo
Date: Wed Aug 14 12:52:17 2019 -0600
Branches: master
https://developer.blender.org/rB1845f0ee8b33698ddd48c2204ad4084a77ab
Cleanup: Fix build error with MSVC
C99 style initializers are C++20 feature and should not be used.
Reported by @deadpin on chat.
===
M source/blender/gpu/GPU_vertex_format.h
===
diff --git a/source/blender/gpu/GPU_vertex_format.h
b/source/blender/gpu/GPU_vertex_format.h
index dc60c52122c..fc468436499 100644
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@ -164,9 +164,9 @@ BLI_INLINE int gpu_convert_i16_to_i10(short x)
BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_v3(const float data[3])
{
GPUPackedNormal n = {
- .x = gpu_convert_normalized_f32_to_i10(data[0]),
- .y = gpu_convert_normalized_f32_to_i10(data[1]),
- .z = gpu_convert_normalized_f32_to_i10(data[2]),
+ gpu_convert_normalized_f32_to_i10(data[0]),
+ gpu_convert_normalized_f32_to_i10(data[1]),
+ gpu_convert_normalized_f32_to_i10(data[2]),
};
return n;
}
@@ -174,9 +174,9 @@ BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_v3(const
float data[3])
BLI_INLINE GPUPackedNormal GPU_normal_convert_i10_s3(const short data[3])
{
GPUPackedNormal n = {
- .x = gpu_convert_i16_to_i10(data[0]),
- .y = gpu_convert_i16_to_i10(data[1]),
- .z = gpu_convert_i16_to_i10(data[2]),
+ gpu_convert_i16_to_i10(data[0]),
+ gpu_convert_i16_to_i10(data[1]),
+ gpu_convert_i16_to_i10(data[2]),
};
return n;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [b3c3c835609] master: cleanup: fix python related build error on windows.
Commit: b3c3c835609ef4f73d8131483d178a35287bf1eb
Author: Lazydodo
Date: Tue Aug 13 19:55:33 2019 -0600
Branches: master
https://developer.blender.org/rBb3c3c835609ef4f73d8131483d178a35287bf1eb
cleanup: fix python related build error on windows.
Recent python changes caused issues on some systems.
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 339b4f9ff26..f74fd57252d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -734,13 +734,13 @@ elseif(WIN32)
install(
FILES
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python${_PYTHON_VERSION_NO_DOTS}.dll
-FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python.exe
+ ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python.exe
DESTINATION ${BLENDER_VERSION}/python/bin
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python${_PYTHON_VERSION_NO_DOTS}_d.dll
-FILES ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python_d.exe
+ ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python_d.exe
DESTINATION ${BLENDER_VERSION}/python/bin
CONFIGURATIONS Debug
)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [54013d541c3] master: build_environment/python: Bump versions of our site-packages
Commit: 54013d541c3a51d2aed1589170bb4ddb59785ff6
Author: Lazydodo
Date: Tue Aug 13 16:58:26 2019 -0600
Branches: master
https://developer.blender.org/rB54013d541c3a51d2aed1589170bb4ddb59785ff6
build_environment/python: Bump versions of our site-packages
IDNA 2.8
CHARDET 3.0.4
URLLIB3 1.25.3
CERTIFI 2019.6.16
REQUESTS 2.22.0
NUMPY1.17.0
===
M build_files/build_environment/cmake/versions.cmake
===
diff --git a/build_files/build_environment/cmake/versions.cmake
b/build_files/build_environment/cmake/versions.cmake
index 1d3da863898..3ee6a4920ed 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -157,16 +157,16 @@ set(OPENVDB_VERSION 5.1.0)
set(OPENVDB_URI
https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
set(OPENVDB_HASH 5310101f874dcfd2165f9cee68c22624)
-set(IDNA_VERSION 2.7)
+set(IDNA_VERSION 2.8)
set(CHARDET_VERSION 3.0.4)
-set(URLLIB3_VERSION 1.23)
-set(CERTIFI_VERSION 2018.8.13)
-set(REQUESTS_VERSION 2.19.1)
-
-set(NUMPY_VERSION v1.15.0)
-set(NUMPY_SHORT_VERSION 1.15)
-set(NUMPY_URI
https://files.pythonhosted.org/packages/3a/20/c81632328b1a4e1db65f45c0a1350a9c5341fd4bbb8ea66cdd98da56fe2e/numpy-1.15.0.zip)
-set(NUMPY_HASH 20e1318508906a98e11c9bf8aa07)
+set(URLLIB3_VERSION 1.25.3)
+set(CERTIFI_VERSION 2019.6.16)
+set(REQUESTS_VERSION 2.22.0)
+
+set(NUMPY_VERSION v1.17.0)
+set(NUMPY_SHORT_VERSION 1.17)
+set(NUMPY_URI
https://files.pythonhosted.org/packages/da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da/numpy-1.17.0.zip)
+set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)
set(LAME_VERSION 3.100)
set(LAME_URI
http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fc0f47e3493] master: make.bat: Support running python from lib folder for make format
Commit: fc0f47e3493ceb3d04117a665353de48df04c32f Author: Lazydodo Date: Tue Aug 13 17:03:09 2019 -0600 Branches: master https://developer.blender.org/rBfc0f47e3493ceb3d04117a665353de48df04c32f make.bat: Support running python from lib folder for make format We are no longer depended on a system python being installed. === M build_files/windows/format.cmd === diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index c291dc581ae..f036257e220 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -9,8 +9,17 @@ exit /b 1 :detect_done echo found clang-format in %CF_PATH% -REM TODO(sergey): Switch to Python from libraries when available. -set PYTHON="python.exe" +if EXIST %BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe ( +set PYTHON=%BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe +goto detect_python_done +) + +echo python not found in lib folder +exit /b 1 + +:detect_python_done +echo found python (%PYTHON%) + set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py REM The formatting script expects clang-format to be in the current PATH. ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c538903558d] master: deps: python 3.7.4 for windows.
Commit: c538903558d8c648817f5921e6f7acd284645214
Author: Lazydodo
Date: Tue Aug 13 17:02:19 2019 -0600
Branches: master
https://developer.blender.org/rBc538903558d8c648817f5921e6f7acd284645214
deps: python 3.7.4 for windows.
This also updates to a new packaging method where python is runnable
from the library folder rather than having tarballs in the release
folder.
===
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/numpy.cmake
A build_files/build_environment/cmake/package_python.cmake
M build_files/build_environment/cmake/python.cmake
M build_files/build_environment/cmake/python_site_packages.cmake
M build_files/cmake/platform/platform_win32.cmake
M source/creator/CMakeLists.txt
===
diff --git a/build_files/build_environment/CMakeLists.txt
b/build_files/build_environment/CMakeLists.txt
index e4fe7d90176..0dbd3b572cf 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -90,6 +90,7 @@ include(cmake/tbb.cmake)
include(cmake/openvdb.cmake)
include(cmake/python.cmake)
include(cmake/python_site_packages.cmake)
+include(cmake/package_python.cmake)
include(cmake/numpy.cmake)
if(UNIX AND NOT APPLE)
# Rely on PugiXML compiled with OpenImageIO
diff --git a/build_files/build_environment/cmake/numpy.cmake
b/build_files/build_environment/cmake/numpy.cmake
index 1a6ffa95ad6..abf2464e88c 100644
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -17,6 +17,7 @@
# * END GPL LICENSE BLOCK *
if(MSVC)
+ message("BIN >${PYTHON_BINARY}<")
if(BUILD_MODE STREQUAL Debug)
set(NUMPY_DIR_POSTFIX -pydebug)
set(NUMPY_ARCHIVE_POSTFIX d)
@@ -30,17 +31,6 @@ endif()
set(NUMPY_POSTFIX)
-if(WIN32)
- set(NUMPY_INSTALL
-${CMAKE_COMMAND} -E copy_directory
"${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy"
"${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
-${CMAKE_COMMAND} -E chdir
"${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
-${CMAKE_COMMAND} -E tar "cfvz"
"${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz"
"."
- )
-else()
- set(NUMPY_INSTALL echo .)
- set(NUMPY_PATCH echo .)
-endif()
-
ExternalProject_Add(external_numpy
URL ${NUMPY_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -50,17 +40,10 @@ ExternalProject_Add(external_numpy
CONFIGURE_COMMAND ""
LOG_BUILD 1
BUILD_COMMAND ${PYTHON_BINARY}
${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION}
install --old-and-unmanageable
- INSTALL_COMMAND ${NUMPY_INSTALL}
+ INSTALL_COMMAND ""
)
-if(WIN32)
- ExternalProject_Add_Step(external_numpy after_install
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
- DEPENDEES install
-)
-endif()
-
add_dependencies(
external_numpy
- Make_Python_Environment
+ external_python
)
diff --git a/build_files/build_environment/cmake/package_python.cmake
b/build_files/build_environment/cmake/package_python.cmake
new file mode 100644
index 000..e2eda66a4e0
--- /dev/null
+++ b/build_files/build_environment/cmake/package_python.cmake
@@ -0,0 +1,58 @@
+# * BEGIN GPL LICENSE BLOCK *
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# * END GPL LICENSE BLOCK *
+
+if(MSVC)
+ set(PYTARGET ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS})
+ set(PYSRC ${LIBDIR}/python/)
+
+ if(BUILD_MODE STREQUAL Release)
+add_custom_command(
+ OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
+ COMMAND echo packaging python
+ COMMAND echo this should ouput at
${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
+ COMMAND ${CMAKE_C
[Bf-blender-cvs] [87d3685e935] master: deps/cleanup: remove partial boost-python support.
Commit: 87d3685e9352a11dec3d093a3473ac1e5b8121d2
Author: Lazydodo
Date: Tue Aug 13 17:00:23 2019 -0600
Branches: master
https://developer.blender.org/rB87d3685e9352a11dec3d093a3473ac1e5b8121d2
deps/cleanup: remove partial boost-python support.
boost python was not required by any dependency nor was it ever properly
supported.
===
M build_files/build_environment/cmake/boost.cmake
===
diff --git a/build_files/build_environment/cmake/boost.cmake
b/build_files/build_environment/cmake/boost.cmake
index 7fcd7e754ae..fabc055ce29 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -33,19 +33,9 @@ if(WIN32)
set(BOOST_TOOLSET toolset=msvc-14.0)
set(BOOST_COMPILER_STRING -vc140)
endif()
- set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
- set(semi_path "${PATCH_DIR}/semi.txt")
- FILE(TO_NATIVE_PATH ${semi_path} semi_path)
- set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
-echo using python : ${PYTHON_OUTPUTDIR}\\python.exe >
"${JAM_FILE}" &&
-echo. : ${BUILD_DIR}/python/src/external_python/include
${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
-echo. : ${BUILD_DIR}/python/src/external_python/pcbuild >>
"${JAM_FILE}" &&
-type ${semi_path} >> "${JAM_FILE}"
- )
+ set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
set(BOOST_BUILD_COMMAND bjam)
- #--user-config=user-config.jam
set(BOOST_BUILD_OPTIONS runtime-link=static )
- #set(BOOST_WITH_PYTHON --with-python)
set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
if(BUILD_MODE STREQUAL Release)
set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E
copy_directory ${LIBDIR}/boost/include/boost-1_68/
${HARVEST_TARGET}/boost/include/)
@@ -82,7 +72,6 @@ set(BOOST_OPTIONS
--with-serialization
--with-program_options
--with-iostreams
- ${BOOST_WITH_PYTHON}
${BOOST_TOOLSET}
)
@@ -100,10 +89,3 @@ ExternalProject_Add(external_boost
BUILD_IN_SOURCE 1
INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
)
-
-if(WIN32)
- add_dependencies(
-external_boost
-Make_Python_Environment
- )
-endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [64b092974c7] master: Cleanup/windows: Remove 32 bit support from make.bat helper script
Commit: 64b092974c712fd0297e6801c1b7a88737185a95
Author: Lazydodo
Date: Mon Aug 5 10:31:51 2019 -0600
Branches: master
https://developer.blender.org/rB64b092974c712fd0297e6801c1b7a88737185a95
Cleanup/windows: Remove 32 bit support from make.bat helper script
This change removes 32 bit support from the helper make.bat scripts
as we are dropping official 32 bit support, you can still build for
32 bit by configuring your build yourself using cmake and pointing
the LIBDIR cmake variable to your own 32 bit library folder.
===
M build_files/cmake/platform/platform_win32.cmake
M build_files/windows/check_libraries.cmd
M build_files/windows/configure_msbuild.cmd
M build_files/windows/detect_architecture.cmd
M build_files/windows/format.cmd
M build_files/windows/parse_arguments.cmd
M build_files/windows/show_help.cmd
M make.bat
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index fa757b2a1c5..8286f5d80a9 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -171,8 +171,7 @@ if(NOT DEFINED LIBDIR)
message(STATUS "64 bit compiler detected.")
set(LIBDIR_BASE "win64")
else()
-message(STATUS "32 bit compiler detected.")
-set(LIBDIR_BASE "windows")
+message(FATAL_ERROR "32 bit compiler detected, blender no longer provides
pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to
your own library folder")
endif()
# Can be 1910..1912
if(MSVC_VERSION GREATER 1919)
@@ -386,9 +385,6 @@ if(WITH_BOOST)
if(CMAKE_CL_64)
set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib")
set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x64-1_68.lib")
-else()
- set(BOOST_POSTFIX "vc140-mt-s-x32-1_68.lib")
- set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x32-1_68.lib")
endif()
set(BOOST_LIBRARIES
optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
diff --git a/build_files/windows/check_libraries.cmd
b/build_files/windows/check_libraries.cmd
index 8c5f7ec7e17..fcae2c90657 100644
--- a/build_files/windows/check_libraries.cmd
+++ b/build_files/windows/check_libraries.cmd
@@ -2,11 +2,7 @@ if "%BUILD_VS_YEAR%"=="2015" set BUILD_VS_LIBDIRPOST=vc14
if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc14
if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc14
-if "%BUILD_ARCH%"=="x64" (
- set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
-) else if "%BUILD_ARCH%"=="x86" (
- set BUILD_VS_SVNDIR=windows_%BUILD_VS_LIBDIRPOST%
-)
+set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%"
if NOT "%verbose%" == "" (
diff --git a/build_files/windows/configure_msbuild.cmd
b/build_files/windows/configure_msbuild.cmd
index c316e2286e5..7cb0a4df689 100644
--- a/build_files/windows/configure_msbuild.cmd
+++ b/build_files/windows/configure_msbuild.cmd
@@ -1,14 +1,6 @@
set BUILD_GENERATOR_POST=
set BUILD_PLATFORM_SELECT=
-if "%BUILD_ARCH%"=="x64" (
- set MSBUILD_PLATFORM=x64
-) else if "%BUILD_ARCH%"=="x86" (
- set MSBUILD_PLATFORM=win32
- if "%WITH_CLANG%"=="1" (
- echo Clang not supported for X86
- exit /b 1
- )
-)
+set MSBUILD_PLATFORM=x64
if "%WITH_CLANG%"=="1" (
set CLANG_CMAKE_ARGS=-T"llvm"
diff --git a/build_files/windows/detect_architecture.cmd
b/build_files/windows/detect_architecture.cmd
index cd211668b7f..42663ef2d29 100644
--- a/build_files/windows/detect_architecture.cmd
+++ b/build_files/windows/detect_architecture.cmd
@@ -6,11 +6,13 @@ if "%BUILD_ARCH%"=="" (
set WINDOWS_ARCH= Win64
set BUILD_ARCH=x64
) else (
- set WINDOWS_ARCH=
- set BUILD_ARCH=x86
+ echo Error: 32 bit builds of blender are no longer supported.
+ goto ERR
)
) else if "%BUILD_ARCH%"=="x64" (
set WINDOWS_ARCH= Win64
-) else if "%BUILD_ARCH%"=="x86" (
- set WINDOWS_ARCH=
)
+:EOF
+exit /b 0
+:ERR
+exit /b 1
\ No newline at end of file
diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd
index 9dd6f1fc83b..c291dc581ae 100644
--- a/build_files/windows/format.cmd
+++ b/build_files/windows/format.cmd
@@ -2,10 +2,6 @@ if EXIST
%BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe (
set CF_PATH=..\lib\win64_vc14\llvm\bin
goto detect_do
[Bf-blender-cvs] [9fbf522dd8c] master: Cleanup: Fix eeve_lut arrays being duplicated in blender binary.
Commit: 9fbf522dd8c0cf5008e46534ffadcabed2bae60c
Author: Lazydodo
Date: Sun Aug 4 14:32:53 2019 -0600
Branches: master
https://developer.blender.org/rB9fbf522dd8c0cf5008e46534ffadcabed2bae60c
Cleanup: Fix eeve_lut arrays being duplicated in blender binary.
Both eevee_materials.c and workbench_deferred.c include eeve_lut.h which has
its arrays marked as static leading to the blue_noise array being embedded into
our binary twice.
This change takes the arrays out of the header and properly marks them as const
since they are lookup tables and should not be written to.
Reviewers: fclem, brecht
Differential Revision: https://developer.blender.org/D5346
===
M source/blender/draw/CMakeLists.txt
A source/blender/draw/engines/eevee/eevee_lut.c
M source/blender/draw/engines/eevee/eevee_lut.h
===
diff --git a/source/blender/draw/CMakeLists.txt
b/source/blender/draw/CMakeLists.txt
index 016cd628969..8dc4972bcc1 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -94,6 +94,7 @@ set(SRC
engines/eevee/eevee_lightprobes.c
engines/eevee/eevee_lights.c
engines/eevee/eevee_lookdev.c
+ engines/eevee/eevee_lut.c
engines/eevee/eevee_materials.c
engines/eevee/eevee_mist.c
engines/eevee/eevee_motion_blur.c
diff --git a/source/blender/draw/engines/eevee/eevee_lut.h
b/source/blender/draw/engines/eevee/eevee_lut.c
similarity index 99%
copy from source/blender/draw/engines/eevee/eevee_lut.h
copy to source/blender/draw/engines/eevee/eevee_lut.c
index 9b9adc2b7d3..8db45e4cee6 100644
--- a/source/blender/draw/engines/eevee/eevee_lut.h
+++ b/source/blender/draw/engines/eevee/eevee_lut.c
@@ -21,10 +21,7 @@
* \ingroup gpu
*/
-#ifndef __EEVEE_LUT_H__
-#define __EEVEE_LUT_H__
-
-static float ltc_mat_ggx[64 * 64 * 4] = {
+const float ltc_mat_ggx[64 * 64 * 4] = {
1.00, 0.00, 0.00, 0.20, 1.00, 0.00, 0.00,
0.000504,
1.00, 0.00, 0.00, 0.002016, 1.00, 0.00, 0.00,
0.004535,
1.00, 0.00, 0.00, 0.008063, 1.00, 0.00, 0.00,
0.012598,
@@ -2074,7 +2071,8 @@ static float ltc_mat_ggx[64 * 64 * 4] = {
0.964420, -0.165154, 0.163178, 1.473200, 0.979856, -0.139302, 0.127531,
1.535740,
0.982561, -0.111340, 0.090346, 1.599820, 0.996389, -0.080812, 0.048901,
1.657700,
};
-static float ltc_mag_ggx[64 * 64 * 2] = {
+
+const float ltc_mag_ggx[64 * 64 * 2] = {
1.00, 0.00, 1.00, 0.00, 1.00, 0.00, 1.00,
0.00, 1.00,
0.00, 1.00, 0.00, 1.00, 0.00, 1.00, 0.00,
1.00, 0.00,
1.00, 0.00, 1.00, 0.00, 0.98, 0.00, 0.94,
0.00, 0.89,
@@ -2988,7 +2986,7 @@ static float ltc_mag_ggx[64 * 64 * 2] = {
0.932164, 0.047190,
};
-static float bsdf_split_sum_ggx[64 * 64 * 2] = {
+const float bsdf_split_sum_ggx[64 * 64 * 2] = {
1.00f, 0.00f, 1.00f, 0.00f, 1.00f, 0.00f,
1.00f, 0.00f,
1.00f, 0.00f, 1.00f, 0.00f, 0.999512f, 0.00f,
0.999512f, 0.00f,
0.999512f, 0.00f, 0.999023f, 0.01f, 0.999023f, 0.01f,
0.998535f, 0.01f,
@@ -4015,7 +4013,7 @@ static float bsdf_split_sum_ggx[64 * 64 * 2] = {
0.626953f, 0.023544f, 0.616699f, 0.022186f, 0.605957f, 0.020920f,
0.594727f, 0.019730f,
};
-static float ltc_disk_integral[64 * 64] = {
+const float ltc_disk_integral[64 * 64] = {
0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f,
0.00f, 0.00f,
0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f,
0.00f, 0.00f,
0.00f, 0.00f, 0.00f, 0.00f, 0.00f, 0.00f,
0.00f, 0.00f,
@@ -4530,7 +4528,7 @@ static float ltc_disk_integral[64 * 64] = {
0.89f, 0.904762f, 0.920635f, 0.936508f, 0.952381f, 0.968254f,
0.984127f, 1.00f,
};
-static float btdf_split_sum_ggx[32][64 * 64] = {
+const float btdf_split_sum_ggx[32][64 * 64] = {
{
0.00f, 1.00f, 0.999512f, 1.00f, 1.00f, 1.00f,
1.00f, 1.00f,
1.00f, 1.00f, 0.999512f, 1.00f, 1.00f, 0.999512f,
1.00f, 1.00f,
@@ -20981,7 +20979,7 @@ static float btdf_split_sum_ggx[32][64 * 64] = {
}};
/* 4 different blue noise, one per channel */
-static float blue_noise[64 * 64][4] = {
+const float blue_noise[64 * 64][4] = {
{0.367188f, 0.855469f, 0.523438f, 0.375000f}, {0.242188f, 0.699219f,
0.164062f, 0.292969f},
{0.828125f, 0.257812f, 0.449219f, 0.679688f}, {0.128906f, 0.523438f,
0.058594f, 0.164062f},
{0.214844f, 0.648438f, 0.75f, 0.492188f}, {0.535156f, 0.226562f,
0.492188f, 0.429688f},
@@ -23031,5 +23029,3 @@ static float blue_noise[64 * 64][4] = {
{0.621094f, 0.089844f, 0.50f, 0.394531f}, {0.523438f, 0.644531f
[Bf-blender-cvs] [418fdee5dc9] master: Cleanup: Mark large arrays of of constant data as const.
Commit: 418fdee5dc9950fef17c1d2fc9f6137af5a42ac9
Author: Lazydodo
Date: Sun Aug 4 14:24:29 2019 -0600
Branches: master
https://developer.blender.org/rB418fdee5dc9950fef17c1d2fc9f6137af5a42ac9
Cleanup: Mark large arrays of of constant data as const.
For background information see D5345
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D5345
===
M intern/cycles/render/sobol.cpp
M source/blender/datatoc/datatoc.c
===
diff --git a/intern/cycles/render/sobol.cpp b/intern/cycles/render/sobol.cpp
index 5fb3531b03b..c821249b239 100644
--- a/intern/cycles/render/sobol.cpp
+++ b/intern/cycles/render/sobol.cpp
@@ -62,7 +62,7 @@ typedef struct SobolDirectionNumbers {
/* Keep simple alignment. */
/* clang-format off */
-static SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS - 1] = {
+static const SobolDirectionNumbers SOBOL_NUMBERS[SOBOL_MAX_DIMENSIONS - 1] = {
{2, 1, 0, {1}},
{3, 2, 1, {1, 3}},
{4, 3, 1, {1, 3, 1}},
@@ -21279,10 +21279,10 @@ void sobol_generate_direction_vectors(uint
vectors[][SOBOL_BITS], int dimensions
v[i] = 1 << (31 - i); // all m's = 1
for (int dim = 1; dim < dimensions; dim++) {
-SobolDirectionNumbers *numbers = _NUMBERS[dim - 1];
-uint s = numbers->s;
-uint a = numbers->a;
-uint *m = numbers->m;
+const SobolDirectionNumbers *numbers = _NUMBERS[dim - 1];
+const uint s = numbers->s;
+const uint a = numbers->a;
+const uint *m = numbers->m;
v = vectors[dim];
diff --git a/source/blender/datatoc/datatoc.c b/source/blender/datatoc/datatoc.c
index 6fe2650d66c..cf8d17e5e7e 100644
--- a/source/blender/datatoc/datatoc.c
+++ b/source/blender/datatoc/datatoc.c
@@ -94,11 +94,11 @@ int main(int argc, char **argv)
fprintf(fpout, "/* DataToC output of file <%s> */\n\n", argv[1]);
/* Quiet 'missing-variable-declarations' warning. */
- fprintf(fpout, "extern int datatoc_%s_size;\n", argv[1]);
- fprintf(fpout, "extern char datatoc_%s[];\n\n", argv[1]);
+ fprintf(fpout, "extern const int datatoc_%s_size;\n", argv[1]);
+ fprintf(fpout, "extern const char datatoc_%s[];\n\n", argv[1]);
- fprintf(fpout, "int datatoc_%s_size = %d;\n", argv[1], (int)size);
- fprintf(fpout, "char datatoc_%s[] = {\n", argv[1]);
+ fprintf(fpout, "const int datatoc_%s_size = %d;\n", argv[1], (int)size);
+ fprintf(fpout, "const char datatoc_%s[] = {\n", argv[1]);
while (size--) {
/* if we want to open in an editor
* this is nicer to avoid very long lines */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [37cef86f0d7] master: Fix: msgfmt add support for cr-lf style line endings
Commit: 37cef86f0d7a4c617d651f56b1c5347e7ec7d479
Author: Lazydodo
Date: Sun Aug 4 11:46:00 2019 -0600
Branches: master
https://developer.blender.org/rB37cef86f0d7a4c617d651f56b1c5347e7ec7d479
Fix: msgfmt add support for cr-lf style line endings
linux did not recognize cr as a valid character.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D5337
===
M source/blender/blentranslation/msgfmt/msgfmt.c
===
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c
b/source/blender/blentranslation/msgfmt/msgfmt.c
index f226699d8bf..86d55e203d9 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -82,12 +82,12 @@ static char *trim(char *str)
return str;
}
- for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\n'); str++, i++) {
+ for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\r','\n'); str++, i++) {
/* pass */
}
char *end = [len - 1 - i];
- for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\n'); end--, i--) {
+ for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\r','\n'); end--, i--) {
/* pass */
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [edcefb739ae] master: Cleanup: Fix build error with msvc
Commit: edcefb739ae0e5263dbf73fea677b2700a06a96e Author: Lazydodo Date: Sat Aug 3 10:47:35 2019 -0600 Branches: master https://developer.blender.org/rBedcefb739ae0e5263dbf73fea677b2700a06a96e Cleanup: Fix build error with msvc math.h does not define M_PI on windows, needs BLI_math_base.h to get them. thanks to @quollism on chat for spotting it. === M release/datafiles/userdef/userdef_default.c === diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index 73146e59123..99c8cd72dba 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -17,7 +17,7 @@ /* Preferences Data File 'U_default'. */ /* For constants. */ -#include +#include "BLI_math_base.h" #include "DNA_userdef_types.h" #include "DNA_curve_types.h" ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3232fc335d8] master: Deps: Fix build error with theora on windows.
Commit: 3232fc335d83f6e1aa5f579483b6aa2694dc2882
Author: Lazydodo
Date: Fri Aug 2 13:29:02 2019 -0600
Branches: master
https://developer.blender.org/rB3232fc335d83f6e1aa5f579483b6aa2694dc2882
Deps: Fix build error with theora on windows.
===
M build_files/build_environment/cmake/theora.cmake
===
diff --git a/build_files/build_environment/cmake/theora.cmake
b/build_files/build_environment/cmake/theora.cmake
index 6cb69c73948..5d41fab5740 100644
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -16,7 +16,11 @@
#
# * END GPL LICENSE BLOCK *
-set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
+if (UNIX)
+ set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
+else()
+ set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV})
+endif()
ExternalProject_Add(external_theora
URL ${THEORA_URI}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9198ff43067] master: Cleanup/Win: Fix build folder name if no target is set
Commit: 9198ff4306792ea5a1eb9c818a61cdd32ef3d7e2 Author: Lazydodo Date: Fri Aug 2 08:24:55 2019 -0600 Branches: master https://developer.blender.org/rB9198ff4306792ea5a1eb9c818a61cdd32ef3d7e2 Cleanup/Win: Fix build folder name if no target is set When you call make.bat without a target the build folder name would have a double underscore in it which looked odd. === M build_files/windows/set_build_dir.cmd === diff --git a/build_files/windows/set_build_dir.cmd b/build_files/windows/set_build_dir.cmd index bb01749c5ee..65b5923cd9a 100644 --- a/build_files/windows/set_build_dir.cmd +++ b/build_files/windows/set_build_dir.cmd @@ -1,4 +1,9 @@ -set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +if NOT "%TARGET%" == "" ( +set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +) else ( +set BUILD_DIR=%BUILD_DIR%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +) + if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( set BUILD_DIR=%BUILD_DIR_OVERRRIDE% ) \ No newline at end of file ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [8936479f769] master: Cleanup/Win: Remove unused game engine variables in build helper scripts
Commit: 8936479f769bde3cdf9a7ba6b7648e5775021122 Author: Lazydodo Date: Fri Aug 2 08:18:34 2019 -0600 Branches: master https://developer.blender.org/rB8936479f769bde3cdf9a7ba6b7648e5775021122 Cleanup/Win: Remove unused game engine variables in build helper scripts === M build_files/windows/reset_variables.cmd M build_files/windows/set_build_dir.cmd === diff --git a/build_files/windows/reset_variables.cmd b/build_files/windows/reset_variables.cmd index 631618040ec..8b74cec238d 100644 --- a/build_files/windows/reset_variables.cmd +++ b/build_files/windows/reset_variables.cmd @@ -7,7 +7,6 @@ set BUILD_VS_YEAR= set BUILD_VS_LIBDIRPOST= set BUILD_VS_LIBDIR= set BUILD_VS_SVNDIR= -set BUILD_NGE= set KEY_NAME= set MSBUILD_PLATFORM= set MUST_CLEAN= diff --git a/build_files/windows/set_build_dir.cmd b/build_files/windows/set_build_dir.cmd index 8842a52eb5b..bb01749c5ee 100644 --- a/build_files/windows/set_build_dir.cmd +++ b/build_files/windows/set_build_dir.cmd @@ -1,4 +1,4 @@ -set BUILD_DIR=%BUILD_DIR%_%TARGET%%BUILD_NGE%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( set BUILD_DIR=%BUILD_DIR_OVERRRIDE% ) \ No newline at end of file ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [219573de22f] functions: Fix: Build error with MSVC
Commit: 219573de22fa13300278c2b018f1258564973455
Author: Lazydodo
Date: Thu Aug 1 15:25:07 2019 -0600
Branches: functions
https://developer.blender.org/rB219573de22fa13300278c2b018f1258564973455
Fix: Build error with MSVC
Zero sized arrays not being at the end of struct/class makes MSVC sad
===
M source/blender/blenkernel/BKE_node_tree.hpp
M source/blender/functions/core/data_graph_builder.hpp
M
source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
===
diff --git a/source/blender/blenkernel/BKE_node_tree.hpp
b/source/blender/blenkernel/BKE_node_tree.hpp
index 3d50766f89f..baaf596f0a6 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -38,8 +38,8 @@ class VirtualNodeTree {
Vector m_links;
Vector m_inputs_with_links;
MultiMap m_nodes_by_idname;
- MonotonicAllocator<> m_allocator;
uint m_socket_counter = 0;
+ MonotonicAllocator<> m_allocator;
public:
void add_all_of_tree(bNodeTree *btree);
diff --git a/source/blender/functions/core/data_graph_builder.hpp
b/source/blender/functions/core/data_graph_builder.hpp
index fc3de824585..78a57b0f777 100644
--- a/source/blender/functions/core/data_graph_builder.hpp
+++ b/source/blender/functions/core/data_graph_builder.hpp
@@ -140,13 +140,13 @@ class BuilderNode {
class DataGraphBuilder {
private:
- MonotonicAllocator<> m_allocator;
- std::unique_ptr> m_source_info_allocator;
Vector m_nodes;
uint m_link_counter = 0;
uint m_input_socket_counter = 0;
uint m_output_socket_counter = 0;
-
+ std::unique_ptr> m_source_info_allocator;
+ MonotonicAllocator<> m_allocator;
+
public:
DataGraphBuilder();
DataGraphBuilder(DataGraphBuilder ) = delete;
diff --git
a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
index 7a03131f8ca..900207cc4f3 100644
---
a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
+++
b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
@@ -19,12 +19,12 @@ using BKE::VirtualSocket;
class VTreeDataGraphBuilder {
private:
VirtualNodeTree _vtree;
- DataGraphBuilder m_graph_builder;
Vector m_socket_map;
Vector m_type_by_vsocket;
StringMap _type_by_idname;
StringMap _type_by_data_type;
StringMap _data_type_by_idname;
+ DataGraphBuilder m_graph_builder;
public:
VTreeDataGraphBuilder(VirtualNodeTree );
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [135413e324b] master: Cleanup/msvc: Remove math.h from creator_signals.c
Commit: 135413e324b8f3f14307dc47aeadf97e6fd446ad Author: Lazydodo Date: Wed Jul 31 21:36:52 2019 -0600 Branches: master https://developer.blender.org/rB135413e324b8f3f14307dc47aeadf97e6fd446ad Cleanup/msvc: Remove math.h from creator_signals.c Was never needed, looks like it was copy/pasted from creator.c spotted by @campbellbarton === M source/creator/creator_signals.c === diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index 96b056d8516..5a5bc74d2d3 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -31,9 +31,6 @@ # endif # ifdef WIN32 -#if defined(_MSC_VER) && defined(_M_X64) -# include /* needed for _set_FMA3_enable */ -#endif #include #include # endif ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fc982c102bb] master: Cleanup: Remove FMA3 Disable for msvc
Commit: fc982c102bb7af6db9c30463f961ead88b2e4356
Author: Lazydodo
Date: Wed Jul 31 20:18:44 2019 -0600
Branches: master
https://developer.blender.org/rBfc982c102bb7af6db9c30463f961ead88b2e4356
Cleanup: Remove FMA3 Disable for msvc
We no longer build with or support msvc2013, so this hack can be removed.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D5298
===
M source/creator/creator.c
===
diff --git a/source/creator/creator.c b/source/creator/creator.c
index b257564519a..afcde70670a 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -25,9 +25,6 @@
#include
#ifdef WIN32
-# if defined(_MSC_VER) && defined(_M_X64)
-#include /* needed for _set_FMA3_enable */
-# endif
# include
# include "utfconv.h"
#endif
@@ -237,12 +234,6 @@ int main(int argc,
_putenv_s("OMP_WAIT_POLICY", "PASSIVE");
# endif
- /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM
- * (fixed in SP1). Just disable it. */
-# if defined(_MSC_VER) && defined(_M_X64)
- _set_FMA3_enable(0);
-# endif
-
/* Win32 Unicode Args */
/* NOTE: cannot use guardedalloc malloc here, as it's not yet initialized
* (it depends on the args passed in, which is what we're getting
here!)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f5f3003874f] master: Fix: build error with MSVC
Commit: f5f3003874f26681000618032d88482367348064
Author: Lazydodo
Date: Wed Jul 31 08:44:58 2019 -0600
Branches: master
https://developer.blender.org/rBf5f3003874f26681000618032d88482367348064
Fix: build error with MSVC
Reviewed By: Brecht
Differential Revision: https://developer.blender.org/D5381
===
M release/datafiles/userdef/userdef_default.c
===
diff --git a/release/datafiles/userdef/userdef_default.c
b/release/datafiles/userdef/userdef_default.c
index 053b8e75153..acdccb79b07 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -79,20 +79,20 @@ const UserDef U_default = {
.app_template = "",
/** Initialized by #UI_theme_init_default. */
-.themes = (ListBase){NULL},
+.themes = {NULL},
/** Initialized by #uiStyleInit. */
-.uifonts = (ListBase){NULL},
-.uistyles = (ListBase){NULL},
+.uifonts = {NULL},
+.uistyles = {NULL},
-.user_keymaps = (ListBase){NULL},
-.user_keyconfig_prefs = (ListBase){NULL},
+.user_keymaps = {NULL},
+.user_keyconfig_prefs = {NULL},
/** Initialized by #BKE_blendfile_userdef_from_defaults. */
-.addons = (ListBase){NULL},
+.addons = {NULL},
-.autoexec_paths = (ListBase){NULL},
-.user_menus = (ListBase){NULL},
+.autoexec_paths = {NULL},
+.user_menus = {NULL},
.keyconfigstr = "blender",
.undosteps = 32,
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5359b7a0330] master: cleanup: Fix typo in last commit
Commit: 5359b7a033078848cc8928cdc63322874bb8d40e
Author: Lazydodo
Date: Tue Jul 30 14:50:53 2019 -0600
Branches: master
https://developer.blender.org/rB5359b7a033078848cc8928cdc63322874bb8d40e
cleanup: Fix typo in last commit
Accidentally took the C flags as a base.
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 536f9c2a074..fa757b2a1c5 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -146,7 +146,7 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
#JMC is available on msvc 15.8 (1915) and up
if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /JMC")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /JMC")
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE
/STACK:2097152 /INCREMENTAL:NO ")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [19b72f50d70] master: CMake/Windows: Enable JMC on compilers that support it.
Commit: 19b72f50d704eb4061ae77a87bf7e8751e04a3ae
Author: Lazydodo
Date: Tue Jul 30 14:40:05 2019 -0600
Branches: master
https://developer.blender.org/rB19b72f50d704eb4061ae77a87bf7e8751e04a3ae
CMake/Windows: Enable JMC on compilers that support it.
JMC [1] enables more productive debugging of C++ code in visual studio
this change enables it on debug builds for builds with visual studio 15.8
or higher.
[1]
https://devblogs.microsoft.com/cppblog/announcing-jmc-stepping-in-visual-studio/
===
M build_files/cmake/platform/platform_win32.cmake
===
diff --git a/build_files/cmake/platform/platform_win32.cmake
b/build_files/cmake/platform/platform_win32.cmake
index 3fc0d20fb46..536f9c2a074 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -144,6 +144,11 @@ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}
/MT")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
+#JMC is available on msvc 15.8 (1915) and up
+if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /JMC")
+endif()
+
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE
/STACK:2097152 /INCREMENTAL:NO ")
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib
/NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [34b3a9583ac] master: Cmake/windows: Fix vcpkg bypassing our libs folder.
Commit: 34b3a9583ac2433dd8d223d2bd098adc30bc72bd Author: Lazydodo Date: Tue Jul 30 11:13:33 2019 -0600 Branches: master https://developer.blender.org/rB34b3a9583ac2433dd8d223d2bd098adc30bc72bd Cmake/windows: Fix vcpkg bypassing our libs folder. Occasionally we get reports of people that build blender and end up with either build errors or end up with builds that do not run on other systems. The root cause is when you install vpckg and integrate it into the build system it puts the search path for its includes and libraries before anything else. previously we told people to either uninstall vcpkg or remove the conflicting packages, which was not great. this change opts out of the use of vcpkg for blender only, so people can keep using it for other work without issues. === M source/creator/CMakeLists.txt === diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 77877ff3cca..e911a591881 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1050,6 +1050,12 @@ unset(LIB) setup_liblinks(blender) +# vcpkg substitutes our libs with theirs, which will cause issues when you +# you run these builds on other systems due to missing dlls. So we opt out +# the use of vcpkg +if (WIN32) + set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false") +endif() # - # Setup launcher ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [248ee40712e] functions: Cleanup: Fix build error with msvc.
Commit: 248ee40712ea7f1fcb6dc2ef03fdac21a5acb13f
Author: Lazydodo
Date: Thu Jul 25 15:18:33 2019 -0600
Branches: functions
https://developer.blender.org/rB248ee40712ea7f1fcb6dc2ef03fdac21a5acb13f
Cleanup: Fix build error with msvc.
===
M source/blender/blenkernel/BKE_node_tree.hpp
M source/blender/blenlib/BLI_string_ref.hpp
===
diff --git a/source/blender/blenkernel/BKE_node_tree.hpp
b/source/blender/blenkernel/BKE_node_tree.hpp
index 84a761f4d0a..d97e35eac5a 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -127,12 +127,11 @@ class VirtualLink;
class VirtualNodeTree {
private:
bool m_frozen = false;
- MonotonicAllocator<> m_allocator;
Vector m_nodes;
Vector m_links;
Vector m_inputs_with_links;
MultiMap m_nodes_by_idname;
-
+ MonotonicAllocator<> m_allocator;
public:
void add_all_of_tree(bNodeTree *btree);
VirtualNode *add_bnode(bNodeTree *btree, bNode *bnode);
diff --git a/source/blender/blenlib/BLI_string_ref.hpp
b/source/blender/blenlib/BLI_string_ref.hpp
index 6749dddf5a1..65affae159b 100644
--- a/source/blender/blenlib/BLI_string_ref.hpp
+++ b/source/blender/blenlib/BLI_string_ref.hpp
@@ -229,7 +229,7 @@ inline bool StringRefBase::endswith(StringRef suffix) const
BLI::StringRef a_ref(a); \
BLI::StringRef b_ref(b); \
uint characters = a_ref.size() + b_ref.size(); \
-char *result##_ptr = BLI_array_alloca(result##_ptr, characters + 1); \
+char *result##_ptr = (char*) BLI_array_alloca(result##_ptr, characters +
1); \
for (uint i = 0; i < a_ref.size(); i++) \
result##_ptr[i] = a_ref[i]; \
for (uint i = 0; i < b_ref.size(); i++) \
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [bddd9d809d2] master: Fix integer overflows in meshcache modifier.
Commit: bddd9d809d2c291eb0a92220195908c51ae2ce80
Author: lazydodo
Date: Fri May 26 06:26:21 2017 -0600
Branches: master
https://developer.blender.org/rBbddd9d809d2c291eb0a92220195908c51ae2ce80
Fix integer overflows in meshcache modifier.
Differential Revision: https://developer.blender.org/D2688
===
M source/blender/modifiers/intern/MOD_meshcache_mdd.c
M source/blender/modifiers/intern/MOD_meshcache_pc2.c
===
diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c
b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
index 90fc750de3b..3dd3a5fc598 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
@@ -35,6 +35,9 @@
#ifdef __LITTLE_ENDIAN__
# include "BLI_endian_switch.h"
#endif
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
#include "MOD_meshcache_util.h" /* own include */
@@ -157,7 +160,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp,
return false;
}
- if (fseek(fp, index * mdd_head.verts_tot * sizeof(float) * 3, SEEK_CUR)
!= 0) {
+ if (fseek(fp, sizeof(float) * 3 * index * mdd_head.verts_tot, SEEK_CUR)
!= 0) {
*err_str = "Failed to seek frame";
return false;
}
diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
index 219eae4ecca..8360c8ffda7 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
@@ -35,6 +35,10 @@
# include "BLI_endian_switch.h"
#endif
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
+
#include "MOD_meshcache_util.h" /* own include */
#include "DNA_modifier_types.h"
@@ -142,7 +146,7 @@ bool MOD_meshcache_read_pc2_index(FILE *fp,
return false;
}
- if (fseek(fp, index * pc2_head.verts_tot * sizeof(float) * 3, SEEK_CUR)
!= 0) {
+ if (fseek(fp, sizeof(float) * 3 * index * pc2_head.verts_tot ,
SEEK_CUR) != 0) {
*err_str = "Failed to seek frame";
return false;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [1358c394555] master: [MSVC] Fix build error. linker was searching for a mangled version of versionstr
Commit: 1358c3945552291febefc22edb554794bcc2e844
Author: lazydodo
Date: Thu May 25 15:23:45 2017 -0600
Branches: master
https://developer.blender.org/rB1358c3945552291febefc22edb554794bcc2e844
[MSVC] Fix build error. linker was searching for a mangled version of versionstr
===
M source/blender/alembic/intern/abc_archive.cc
===
diff --git a/source/blender/alembic/intern/abc_archive.cc
b/source/blender/alembic/intern/abc_archive.cc
index ff14cf15124..bd16196cb78 100644
--- a/source/blender/alembic/intern/abc_archive.cc
+++ b/source/blender/alembic/intern/abc_archive.cc
@@ -23,8 +23,10 @@
*/
#include "abc_archive.h"
-
-#include "BKE_blender_version.h"
+extern "C"
+{
+ #include "BKE_blender_version.h"
+}
#ifdef WIN32
# include "utfconv.h"
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f3d9f0c779c] master: [msvc] Use debug nunmpy archive for debug builds
Commit: f3d9f0c779ca788d5c1c4755bb211b4fb3a26310
Author: lazydodo
Date: Sun May 21 09:31:55 2017 -0600
Branches: master
https://developer.blender.org/rBf3d9f0c779ca788d5c1c4755bb211b4fb3a26310
[msvc] Use debug nunmpy archive for debug builds
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index eea45545949..504d0de9145 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -721,9 +721,9 @@ elseif(WIN32)
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
COMMAND ${CMAKE_COMMAND} -E
- tar xzvf
"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz"
+ tar xzvf
"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}$<$:d>.tar.gz"
DEPENDS
-
${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz
+
${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}$<$:d>.tar.gz
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c9451f1cff4] master: [Cycles] Fix math problems in safe_logf
Commit: c9451f1cff4403855d5a77c15cfd428e0a9ebe87
Author: lazydodo
Date: Sun May 7 09:16:14 2017 -0600
Branches: master
https://developer.blender.org/rBc9451f1cff4403855d5a77c15cfd428e0a9ebe87
[Cycles] Fix math problems in safe_logf
log(0) is undefined and should not have been included
log(1) == 0, dividing by zero is not recommended
===
M intern/cycles/util/util_math.h
===
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 12abd8e201e..b719640b19c 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -492,17 +492,17 @@ ccl_device float safe_powf(float a, float b)
return compatible_powf(a, b);
}
-ccl_device float safe_logf(float a, float b)
+ccl_device float safe_divide(float a, float b)
{
- if(UNLIKELY(a < 0.0f || b < 0.0f))
- return 0.0f;
-
- return logf(a)/logf(b);
+ return (b != 0.0f)? a/b: 0.0f;
}
-ccl_device float safe_divide(float a, float b)
+ccl_device float safe_logf(float a, float b)
{
- return (b != 0.0f)? a/b: 0.0f;
+ if(UNLIKELY(a <= 0.0f || b <= 0.0f))
+ return 0.0f;
+
+ return safe_divide(logf(a),logf(b));
}
ccl_device float safe_modulo(float a, float b)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ad8587b7980] master: [msvc/make.bat] Limit the amount of simultaneously compiled projects.
Commit: ad8587b7980c836e6b65955398f2b970401823fb Author: lazydodo Date: Wed May 3 15:15:35 2017 -0600 Branches: master https://developer.blender.org/rBad8587b7980c836e6b65955398f2b970401823fb [msvc/make.bat] Limit the amount of simultaneously compiled projects. This was set to maxcpu which in an 8 core box would be 8, each project would then spawn 8 instances of cl.exe, making a possible of 64 simultaneously running compiler instances slowing the compile down instead of speeding it up. === M make.bat === diff --git a/make.bat b/make.bat index f818df5fcc1..988cb5f4c68 100644 --- 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 ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fc8f428224a] master: fix typo in WITH_SYSTEM_GFLOG in CMakeLists.txt
Commit: fc8f428224a8e77ba66394ad8238a406fa24ee3a Author: lazydodo Date: Sun Apr 30 10:52:38 2017 -0600 Branches: master https://developer.blender.org/rBfc8f428224a8e77ba66394ad8238a406fa24ee3a fix typo in WITH_SYSTEM_GFLOG in CMakeLists.txt === M CMakeLists.txt === diff --git a/CMakeLists.txt b/CMakeLists.txt index 662735d3fc8..1dac082459f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,7 +365,7 @@ mark_as_advanced(WITH_LIBMV_SCHUR_SPECIALIZATIONS) # Logging/unbit test libraries. option(WITH_SYSTEM_GFLAGS "Use system-wide Gflags instead of a bundled one" OFF) -option(WITH_SYSTEM_GFLOG"Use system-wide Glog instead of a bundled one" OFF) +option(WITH_SYSTEM_GLOG "Use system-wide Glog instead of a bundled one" OFF) mark_as_advanced(WITH_SYSTEM_GFLAGS) mark_as_advanced(WITH_SYSTEM_GLOG) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [25b2dfcbf0e] blender2.8: [msvc/make.bat] Provide a convenience rebuild.cmd in the build folder for easy rebuilds.
Commit: 25b2dfcbf0e697bf81370a854caf6aee5fe2cc6a Author: lazydodo Date: Wed Apr 26 08:46:35 2017 -0600 Branches: blender2.8 https://developer.blender.org/rB25b2dfcbf0e697bf81370a854caf6aee5fe2cc6a [msvc/make.bat] Provide a convenience rebuild.cmd in the build folder for easy rebuilds. === M make.bat === diff --git a/make.bat b/make.bat index e16ec3670ba..ba5832f9524 100644 --- a/make.bat +++ b/make.bat @@ -250,6 +250,23 @@ if "%MUST_CONFIGURE%"=="1" ( 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 ^ + /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 + if "%NOBUILD%"=="1" goto EOF msbuild ^ @@ -274,7 +291,7 @@ msbuild ^ echo. echo At any point you can optionally modify your build configuration by editing: -echo "%BUILD_DIR%\CMakeCache.txt", then run "make" again to build with the changes applied. +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. ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c13acebd613] master: [msvc/make.bat] Provide a convenience rebuild.cmd in the build folder for easy rebuilds.
Commit: c13acebd61393204747ce11fe641b84d90fa2bb0 Author: lazydodo Date: Wed Apr 26 08:46:35 2017 -0600 Branches: master https://developer.blender.org/rBc13acebd61393204747ce11fe641b84d90fa2bb0 [msvc/make.bat] Provide a convenience rebuild.cmd in the build folder for easy rebuilds. === M make.bat === diff --git a/make.bat b/make.bat index 9bdab5719da..f818df5fcc1 100644 --- a/make.bat +++ b/make.bat @@ -250,6 +250,23 @@ if "%MUST_CONFIGURE%"=="1" ( 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 ^ + /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 + if "%NOBUILD%"=="1" goto EOF msbuild ^ @@ -274,7 +291,7 @@ msbuild ^ echo. echo At any point you can optionally modify your build configuration by editing: -echo "%BUILD_DIR%\CMakeCache.txt", then run "make" again to build with the changes applied. +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. ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0f2d0ff124c] master: workaround for T50176
Commit: 0f2d0ff124c67d474a29406525953e63a659bb91
Author: lazydodo
Date: Tue Apr 25 14:17:41 2017 -0600
Branches: master
https://developer.blender.org/rB0f2d0ff124c67d474a29406525953e63a659bb91
workaround for T50176
This works around a long outstanding issue T50176 with cycles on msvc2015/x86 .
root cause is still unknown though,feels like a game of whack'a'mole
Reviewers: sergey, dingto
Subscribers: Blendify
Tags: #cycles
Differential Revision: https://developer.blender.org/D2573
===
M intern/cycles/render/shader.cpp
===
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index a7d42a4b4a0..015d0fa087b 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -49,6 +49,16 @@ static float beckmann_table_slope_max()
return 6.0;
}
+
+/* MSVC 2015 needs this ugly hack to prevent a codegen bug on x86
+ * see T50176 for details
+ */
+#if _MSC_VER==1900
+# define MSVC_VOLATILE volatile
+#else
+# define MSVC_VOLATILE
+#endif
+
/* Paper used: Importance Sampling Microfacet-Based BSDFs with the
* Distribution of Visible Normals. Supplemental Material 2/2.
*
@@ -72,7 +82,7 @@ static void beckmann_table_rows(float *table, int row_from,
int row_to)
slope_x[0] = (double)-beckmann_table_slope_max();
CDF_P22_omega_i[0] = 0;
- for(int index_slope_x = 1; index_slope_x < DATA_TMP_SIZE;
++index_slope_x) {
+ for(MSVC_VOLATILE int index_slope_x = 1; index_slope_x <
DATA_TMP_SIZE; ++index_slope_x) {
/* slope_x */
slope_x[index_slope_x] =
(double)(-beckmann_table_slope_max() + 2.0f * beckmann_table_slope_max() *
index_slope_x/(DATA_TMP_SIZE - 1.0f));
@@ -116,6 +126,8 @@ static void beckmann_table_rows(float *table, int row_from,
int row_to)
}
}
+#undef MSVC_VOLATILE
+
static void beckmann_table_build(vector& table)
{
table.resize(BECKMANN_TABLE_SIZE*BECKMANN_TABLE_SIZE);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f1ada2e719a] master: [msvc/make.bat] Add convenience option to turn off game engine+player
Commit: f1ada2e719a9ee7fb99bd69345c8913d8bc4a035 Author: lazydodo Date: Sun Apr 23 14:45:51 2017 -0600 Branches: master https://developer.blender.org/rBf1ada2e719a9ee7fb99bd69345c8913d8bc4a035 [msvc/make.bat] Add convenience option to turn off game engine+player === M make.bat === diff --git a/make.bat b/make.bat index 390e379830c..9bdab5719da 100644 --- a/make.bat +++ b/make.bat @@ -17,6 +17,7 @@ set BUILD_CMAKE_ARGS= set BUILD_ARCH= set BUILD_VS_VER= set BUILD_VS_YEAR= +set BUILD_NGE= set KEY_NAME= set MSBUILD_PLATFORM= set MUST_CLEAN= @@ -36,6 +37,9 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations + ) else if "%1" == "noge" ( + set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_GAMEENGINE=OFF -DWITH_PLAYER=OFF + set BUILD_NGE=_noge ) else if "%1" == "builddir" ( set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" shift /1 @@ -189,7 +193,7 @@ if %ERRORLEVEL% NEQ 0 ( ) -set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% +set BUILD_DIR=%BUILD_DIR%_%TARGET%%BUILD_NGE%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( set BUILD_DIR=%BUILD_DIR_OVERRRIDE% ) @@ -293,6 +297,7 @@ goto EOF 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^) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [4a9e546fedd] master: [msvc/make.bat] Allow override of the build folder name
Commit: 4a9e546fedd7f6ee1d2d0ba7b2eeaee309aa6905 Author: lazydodo Date: Sun Apr 23 10:10:57 2017 -0600 Branches: master https://developer.blender.org/rB4a9e546fedd7f6ee1d2d0ba7b2eeaee309aa6905 [msvc/make.bat] Allow override of the build folder name === M make.bat === diff --git a/make.bat b/make.bat index dd82b1ca8a7..390e379830c 100644 --- a/make.bat +++ b/make.bat @@ -1,7 +1,7 @@ @echo off REM This batch file does an out-of-source CMake build in ../build_windows REM This is for users who like to configure & build Blender with a single command. - +setlocal EnableDelayedExpansion setlocal ENABLEEXTENSIONS set BLENDER_DIR=%~dp0 set BLENDER_DIR_NOSPACES=%BLENDER_DIR: =% @@ -12,6 +12,7 @@ if not "%BLENDER_DIR%"=="%BLENDER_DIR_NOSPACES%" ( set BUILD_DIR=%BLENDER_DIR%..\build_windows set BUILD_TYPE=Release rem reset all variables so they do not get accidentally get carried over from previous builds +set BUILD_DIR_OVERRRIDE= set BUILD_CMAKE_ARGS= set BUILD_ARCH= set BUILD_VS_VER= @@ -35,6 +36,9 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations + ) else if "%1" == "builddir" ( + set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" + shift /1 ) else if "%1" == "with_tests" ( set TESTS_CMAKE_ARGS=-DWITH_GTESTS=On ) else if "%1" == "full" ( @@ -186,7 +190,9 @@ if %ERRORLEVEL% NEQ 0 ( set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% - +if NOT "%BUILD_DIR_OVERRRIDE%"=="" ( + set BUILD_DIR=%BUILD_DIR_OVERRRIDE% +) where /Q cmake if %ERRORLEVEL% NEQ 0 ( @@ -289,6 +295,7 @@ goto EOF echo - with_tests ^(enable building unit tests^) 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^) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [dc5bd2784f3] master: [cmake] Fix Alembic build errors with msvc
Commit: dc5bd2784f320a5aa017565930291f08b0e1bbd4
Author: lazydodo
Date: Fri Apr 21 12:18:19 2017 -0600
Branches: master
https://developer.blender.org/rBdc5bd2784f320a5aa017565930291f08b0e1bbd4
[cmake] Fix Alembic build errors with msvc
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 3ea93a96290..6447559f62c 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -37,6 +37,12 @@ macro(windows_find_package package_name
endif(WITH_WINDOWS_FIND_MODULES)
endmacro()
+macro(find_package_wrapper)
+ if(WITH_WINDOWS_FIND_MODULES)
+ find_package(${ARGV})
+ endif()
+endmacro()
+
add_definitions(-DWIN32)
# Minimum MSVC Version
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
@@ -432,6 +438,7 @@ if(WITH_ALEMBIC)
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
set(ALEMBIC_LIBRARIES optimized alembic debug alembic_d)
+ set(ALEMBIC_FOUND 1)
endif()
if(WITH_MOD_CLOTH_ELTOPO)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [b332fc8f23c] master: [Cycles/msvc] Get cycles_kernel compile time under control.
Commit: b332fc8f23c9995923abbf526e67517f1a26f073
Author: lazydodo
Date: Fri Apr 7 10:25:54 2017 -0600
Branches: master
https://developer.blender.org/rBb332fc8f23c9995923abbf526e67517f1a26f073
[Cycles/msvc] Get cycles_kernel compile time under control.
Ever since we merged the extra texture types (half etc) and spit kernel the
compile time for cycles_kernel has been going out of control.
It's currently sitting at a cool 1295.762 seconds with our standard compiler
(2013/x64/release)
I'm not entirely sure why msvc gets upset with it, but the inlining of matrix
near the bottom of the tri-cubic 3d interpolator is the source of the issue,
this patch excludes it from being inlined.
This patch bring it back down to a manageable 186 seconds. (7x faster!!)
with the attached bzzt.blend that @sergey kindly provided i got the following
results with builds with identical hashes
58:51.73 buildbot
58:04.23 Patched
it's really close, the slight speedup could be explained by the switch instead
of having multiple if's (switches do generate more optimal code than a chain of
if/else/if/else statements) but in all honesty it might just have been pure
luck (dev box,very polluted, bad for benchmarks) regardless, this patch doesn't
seem to slow down anything with my limited testing.
{F532336}
{F532337}
Reviewers: brecht, lukasstockner97, juicyfruit, dingto, sergey
Reviewed By: brecht, dingto, sergey
Subscribers: InsigMathK, sergey
Tags: #cycles
Differential Revision: https://developer.blender.org/D2595
===
M intern/cycles/kernel/kernel_compat_cpu.h
M intern/cycles/util/util_types.h
===
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h
b/intern/cycles/kernel/kernel_compat_cpu.h
index ae7c9b836c4..cad5f4d2959 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -316,184 +316,203 @@ template struct texture_image {
return interp_3d_ex(x, y, z, interpolation);
}
- ccl_always_inline float4 interp_3d_ex(float x, float y, float z,
- int interpolation =
INTERPOLATION_LINEAR)
+ ccl_always_inline float4 interp_3d_ex_closest(float x, float y, float z)
{
- if(UNLIKELY(!data))
- return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-
- int ix, iy, iz, nix, niy, niz;
-
- if(interpolation == INTERPOLATION_CLOSEST) {
- frac(x*(float)width, );
- frac(y*(float)height, );
- frac(z*(float)depth, );
-
- switch(extension) {
- case EXTENSION_REPEAT:
- ix = wrap_periodic(ix, width);
- iy = wrap_periodic(iy, height);
- iz = wrap_periodic(iz, depth);
- break;
- case EXTENSION_CLIP:
- if(x < 0.0f || y < 0.0f || z < 0.0f ||
- x > 1.0f || y > 1.0f || z > 1.0f)
- {
- return make_float4(0.0f, 0.0f,
0.0f, 0.0f);
- }
- /* Fall through. */
- case EXTENSION_EXTEND:
- ix = wrap_clamp(ix, width);
- iy = wrap_clamp(iy, height);
- iz = wrap_clamp(iz, depth);
- break;
- default:
- kernel_assert(0);
+ int ix, iy, iz;
+ frac(x*(float)width, );
+ frac(y*(float)height, );
+ frac(z*(float)depth, );
+
+ switch(extension) {
+ case EXTENSION_REPEAT:
+ ix = wrap_periodic(ix, width);
+ iy = wrap_periodic(iy, height);
+ iz = wrap_periodic(iz, depth);
+ break;
+ case EXTENSION_CLIP:
+ if(x < 0.0f || y < 0.0f || z < 0.0f ||
+ x > 1.0f || y > 1.0f || z > 1.0f)
+ {
return make_float4(0.0f, 0.0f, 0.0f,
0.0f);
- }
-
- return read(data[ix + iy*width + iz*width*height]);
+ }
+ /* Fall through. */
+ case EXTENSION_EXTEND
[Bf-blender-cvs] [7ae9d092d0d] master: Fix alembic build error with MSVC
Commit: 7ae9d092d0d3e3279a0dff6940e46e314cf42ec0
Author: lazydodo
Date: Wed Apr 5 10:59:29 2017 -0600
Branches: master
https://developer.blender.org/rB7ae9d092d0d3e3279a0dff6940e46e314cf42ec0
Fix alembic build error with MSVC
===
M source/blender/alembic/intern/abc_util.cc
===
diff --git a/source/blender/alembic/intern/abc_util.cc
b/source/blender/alembic/intern/abc_util.cc
index f82b07e91fb..aa95180dfe2 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -542,7 +542,7 @@ ScopeTimer::~ScopeTimer()
bool SimpleLogger::empty()
{
- return m_stream.tellp() == 0ul;
+ return ((size_t)m_stream.tellp()) == 0ul;
}
std::string SimpleLogger::str() const
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [15fb1fdb99] blender-v2.78c-release: [msvc] Set proper OpenSubdiv flags when not using find_package to find opensubdiv. Fixes T50548
Commit: 15fb1fdb99700d1efecf2e2934595ab18723960a
Author: lazydodo
Date: Sun Jan 29 10:00:11 2017 -0700
Branches: blender-v2.78c-release
https://developer.blender.org/rB15fb1fdb99700d1efecf2e2934595ab18723960a
[msvc] Set proper OpenSubdiv flags when not using find_package to find
opensubdiv. Fixes T50548
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 79efe31950..8968581b95 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -451,6 +451,12 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
)
+set(OPENSUBDIV_HAS_OPENMP TRUE)
+ set(OPENSUBDIV_HAS_TBB FALSE)
+ set(OPENSUBDIV_HAS_OPENCL TRUE)
+ set(OPENSUBDIV_HAS_CUDA FALSE)
+ set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
+ set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
windows_find_package(OpenSubdiv)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [41e0085fd3] master: [Alembic] Fix msvc warning - C4138 '*/' found outside of comment
Commit: 41e0085fd3af90612d034ad19cec3aa4cb686688
Author: lazydodo
Date: Wed Feb 15 12:40:41 2017 -0700
Branches: master
https://developer.blender.org/rB41e0085fd3af90612d034ad19cec3aa4cb686688
[Alembic] Fix msvc warning - C4138 '*/' found outside of comment
===
M source/blender/alembic/intern/abc_curves.cc
M source/blender/alembic/intern/abc_points.cc
M source/blender/alembic/intern/abc_transform.cc
===
diff --git a/source/blender/alembic/intern/abc_curves.cc
b/source/blender/alembic/intern/abc_curves.cc
index 282777f3af..0542255d84 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -361,7 +361,7 @@ void read_curve_sample(Curve *cu, const ICurvesSchema
, const float time)
* object directly and create a new DerivedMesh from that. Also we might need
to
* create new or delete existing NURBS in the curve.
*/
-DerivedMesh *AbcCurveReader::read_derivedmesh(DerivedMesh */*dm*/, const float
time, int /*read_flag*/, const char **/*err_str*/)
+DerivedMesh *AbcCurveReader::read_derivedmesh(DerivedMesh * /*dm*/, const
float time, int /*read_flag*/, const char ** /*err_str*/)
{
ISampleSelector sample_sel(time);
const ICurvesSchema::Sample sample =
m_curves_schema.getValue(sample_sel);
diff --git a/source/blender/alembic/intern/abc_points.cc
b/source/blender/alembic/intern/abc_points.cc
index 4c78f3e83c..fc84759b1d 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -200,7 +200,7 @@ void read_points_sample(const IPointsSchema ,
read_mverts(config.mvert, positions, vnormals);
}
-DerivedMesh *AbcPointsReader::read_derivedmesh(DerivedMesh *dm, const float
time, int /*read_flag*/, const char **/*err_str*/)
+DerivedMesh *AbcPointsReader::read_derivedmesh(DerivedMesh *dm, const float
time, int /*read_flag*/, const char ** /*err_str*/)
{
ISampleSelector sample_sel(time);
const IPointsSchema::Sample sample = m_schema.getValue(sample_sel);
diff --git a/source/blender/alembic/intern/abc_transform.cc
b/source/blender/alembic/intern/abc_transform.cc
index 368a811bb2..2c6ef09326 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -122,7 +122,7 @@ Imath::Box3d AbcTransformWriter::bounds()
return Imath::transform(bounds, m_matrix);
}
-bool AbcTransformWriter::hasAnimation(Object */*ob*/) const
+bool AbcTransformWriter::hasAnimation(Object * /*ob*/) const
{
/* TODO(kevin): implement this. */
return true;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [a3e746733d] blender-v2.78b-release: [msvc] cmake fixes to support the recent for oiio/ffmpeg/numpy version changes.
Commit: a3e746733d7c358eb6293288283aaac51740f9ae
Author: lazydodo
Date: Fri Feb 3 09:47:54 2017 -0700
Branches: blender-v2.78b-release
https://developer.blender.org/rBa3e746733d7c358eb6293288283aaac51740f9ae
[msvc] cmake fixes to support the recent for oiio/ffmpeg/numpy version changes.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
M source/creator/CMakeLists.txt
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 5efda52b2c..ecdba59978 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -236,14 +236,14 @@ if(WITH_CODEC_FFMPEG)
windows_find_package(FFMPEG)
if(NOT FFMPEG_FOUND)
warn_hardcoded_paths(ffmpeg)
- set(FFMPEG_LIBRARY_VERSION 55)
- set(FFMPEG_LIBRARY_VERSION_AVU 52)
+ set(FFMPEG_LIBRARY_VERSION 57)
+ set(FFMPEG_LIBRARY_VERSION_AVU 55)
set(FFMPEG_LIBRARIES
-
${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avdevice-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avutil-${FFMPEG_LIBRARY_VERSION_AVU}.lib
- ${LIBDIR}/ffmpeg/lib/swscale-2.lib
+ ${LIBDIR}/ffmpeg/lib/avcodec.lib
+ ${LIBDIR}/ffmpeg/lib/avformat.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice.lib
+ ${LIBDIR}/ffmpeg/lib/avutil.lib
+ ${LIBDIR}/ffmpeg/lib/swscale.lib
)
endif()
endif()
@@ -378,6 +378,7 @@ if(WITH_OPENIMAGEIO)
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
add_definitions(-DOIIO_STATIC_BUILD)
+ add_definitions(-DOIIO_NO_SSE=1)
endif()
if(WITH_LLVM)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f65688e130..2df5ddc81a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -713,10 +713,7 @@ elseif(WIN32)
)
if(WITH_PYTHON_INSTALL_NUMPY)
- set(PYTHON_NUMPY_VERSION 1.9)
- if(MSVC_VERSION EQUAL 1900)
- set(PYTHON_NUMPY_VERSION 1.11)
- endif()
+ set(PYTHON_NUMPY_VERSION 1.10)
add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
COMMAND ${CMAKE_COMMAND} -E
make_directory
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -830,11 +827,12 @@ elseif(WIN32)
else()
install(
FILES
- ${LIBDIR}/ffmpeg/lib/avcodec-55.dll
- ${LIBDIR}/ffmpeg/lib/avformat-55.dll
- ${LIBDIR}/ffmpeg/lib/avdevice-55.dll
- ${LIBDIR}/ffmpeg/lib/avutil-52.dll
- ${LIBDIR}/ffmpeg/lib/swscale-2.dll
+ ${LIBDIR}/ffmpeg/lib/avcodec-57.dll
+ ${LIBDIR}/ffmpeg/lib/avformat-57.dll
+ ${LIBDIR}/ffmpeg/lib/avdevice-57.dll
+ ${LIBDIR}/ffmpeg/lib/avutil-55.dll
+ ${LIBDIR}/ffmpeg/lib/swscale-4.dll
+ ${LIBDIR}/ffmpeg/lib/swresample-2.dll
DESTINATION "."
)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [b99491caf7] master: [msvc] Set proper OpenSubdiv flags when not using find_package to find opensubdiv. Fixes T50548
Commit: b99491caf78f2e74bc5f87e5d36f5363910acc3d
Author: lazydodo
Date: Sun Jan 29 10:00:11 2017 -0700
Branches: master
https://developer.blender.org/rBb99491caf78f2e74bc5f87e5d36f5363910acc3d
[msvc] Set proper OpenSubdiv flags when not using find_package to find
opensubdiv. Fixes T50548
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 1a266df779..45a44596e6 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -453,6 +453,12 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
)
+set(OPENSUBDIV_HAS_OPENMP TRUE)
+ set(OPENSUBDIV_HAS_TBB FALSE)
+ set(OPENSUBDIV_HAS_OPENCL TRUE)
+ set(OPENSUBDIV_HAS_CUDA FALSE)
+ set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
+ set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
windows_find_package(OpenSubdiv)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [64f5afdb89] master: [Cycles/MSVC/Testing] Fix broken test code.
Commit: 64f5afdb89bbf3831e97d76a178acee1d9524452
Author: lazydodo
Date: Wed Jan 25 09:36:41 2017 -0700
Branches: master
https://developer.blender.org/rB64f5afdb89bbf3831e97d76a178acee1d9524452
[Cycles/MSVC/Testing] Fix broken test code.
Currently the tests don't run on windows for the following reasons
1) render_graph_finalize has an linking issue due missing a bunch of libraries
(not sure why this is not an issue for linux)
2) This one is more interesting, in test/python/cmakelists.txt
${TEST_BLENDER_EXE_BARE} and ${TEST_BLENDER_EXE} are flat out wrong, but for
some reason this doesn't matter for most tests, cause ctest will actually go
out and look for the executable and fix the path for you *BUT* only for the
command, if you use them in any of the parameters it'll happily pass on the
wrong path.
3) on linux you can just run a .py file, windows is not as awesome and needs to
be told to run it with pyton.
4) had to use the NAME/COMMAND long form of add_test otherwise
$ doesn't get expanded, why? beats me.
5) missing idiff.exe for msvc2015/x64 in the libs folder.
This patch addresses 1-4 , but given I have no working Linux build environment,
I'm unsure if it'll break anything there
5 has been fixed in rBL61751
Reviewers: juicyfruit, brecht, sergey
Reviewed By: sergey
Subscribers: Blendify
Tags: #cycles, #automated_testing
Differential Revision: https://developer.blender.org/D2367
===
M build_files/cmake/Modules/GTestTesting.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_win32_msvc.cmake
M intern/cycles/test/CMakeLists.txt
M make.bat
M tests/gtests/CMakeLists.txt
M tests/gtests/blenlib/BLI_string_test.cc
M tests/gtests/testing/CMakeLists.txt
M tests/python/CMakeLists.txt
===
diff --git a/build_files/cmake/Modules/GTestTesting.cmake
b/build_files/cmake/Modules/GTestTesting.cmake
index 96c06ef8eb..0732e10133 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -45,7 +45,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
RUNTIME_OUTPUT_DIRECTORY_DEBUG
"${TESTS_OUTPUT_DIR}"
INCLUDE_DIRECTORIES
"${TEST_INC}")
if(${DO_ADD_TEST})
- add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
+ add_test(NAME ${NAME}_test COMMAND
${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $)
endif()
endif()
endmacro()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 2e3a190706..09428953a4 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -416,14 +416,7 @@ function(setup_liblinks
target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
- if(WIN32 AND NOT UNIX)
- file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG
"${OPENSUBDIV_LIBRARIES}" "_d")
- target_link_libraries_debug(${target}
"${OPENSUBDIV_LIBRARIES_DEBUG}")
- target_link_libraries_optimized(${target}
"${OPENSUBDIV_LIBRARIES}")
- unset(OPENSUBDIV_LIBRARIES_DEBUG)
- else()
target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
- endif()
endif()
if(WITH_OPENVDB)
target_link_libraries(${target} ${OPENVDB_LIBRARIES}
${TBB_LIBRARIES})
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 3b50351a13..1a266df779 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -446,10 +446,14 @@ if(WITH_MOD_CLOTH_ELTOPO)
endif()
if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
- set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
- set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
- set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib
${OPENSUBDIV_LIBPATH}/osdGPU.lib)
- find_package(OpenSubdiv)
+set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
+set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
+set(OPENSUBDIV_LIBRARIESoptimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
+optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
+debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
+debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
+)
+windows_find_package(OpenSubdiv)
endif()
if(WITH_SDL)
diff --git a/intern/cycles/te
[Bf-blender-cvs] [feb2f0ae30] blender-v2.78b-release: FIX T49899: Add EIGEN_MAKE_ALIGNED_OPERATOR_NEW to classes that use eigen's data types , to force aligned on 16 byte boundaries.
Commit: feb2f0ae3041d27cba9a8aaadaf31bfcbab67ff2
Author: lazydodo
Date: Tue Nov 15 13:21:01 2016 -0700
Branches: blender-v2.78b-release
https://developer.blender.org/rBfeb2f0ae3041d27cba9a8aaadaf31bfcbab67ff2
FIX T49899: Add EIGEN_MAKE_ALIGNED_OPERATOR_NEW to classes that use eigen's
data types , to force aligned on 16 byte boundaries.
===
M intern/iksolver/intern/IK_QSegment.h
M intern/iksolver/intern/IK_Solver.cpp
===
diff --git a/intern/iksolver/intern/IK_QSegment.h
b/intern/iksolver/intern/IK_QSegment.h
index 74f157aa76..247807dc5e 100644
--- a/intern/iksolver/intern/IK_QSegment.h
+++ b/intern/iksolver/intern/IK_QSegment.h
@@ -60,6 +60,7 @@
class IK_QSegment
{
public:
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
virtual ~IK_QSegment();
// start: a user defined translation
diff --git a/intern/iksolver/intern/IK_Solver.cpp
b/intern/iksolver/intern/IK_Solver.cpp
index cefb8c7ed7..a00db4fa2f 100644
--- a/intern/iksolver/intern/IK_Solver.cpp
+++ b/intern/iksolver/intern/IK_Solver.cpp
@@ -42,6 +42,7 @@ using namespace std;
class IK_QSolver {
public:
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
IK_QSolver() : root(NULL) {
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [5a8b5a0] master: Land D2339 by bliblu bli
Commit: 5a8b5a0377781b5d03b39543a58175d8f4bc2bab
Author: lazydodo
Date: Fri Dec 9 08:28:04 2016 -0700
Branches: master
https://developer.blender.org/rB5a8b5a0377781b5d03b39543a58175d8f4bc2bab
Land D2339 by bliblu bli
===
M intern/cycles/device/device.cpp
M intern/cycles/device/device.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/session.cpp
M intern/cycles/render/shader.cpp
===
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index ff9387b..31c99f4 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -64,6 +64,8 @@ std::ostream& operator <<(std::ostream ,
<< string_from_bool(requested_features.use_integrator_branched) <<
std::endl;
os << "Use Patch Evaluation: "
<< string_from_bool(requested_features.use_patch_evaluation) <<
std::endl;
+ os << "Use Transparent Shadows: "
+ << string_from_bool(requested_features.use_transparent) << std::endl;
return os;
}
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 988ad10..ccee25a 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -117,6 +117,9 @@ public:
/* Use OpenSubdiv patch evaluation */
bool use_patch_evaluation;
+
+ /* Use Transparent shadows */
+ bool use_transparent;
DeviceRequestedFeatures()
{
@@ -133,6 +136,7 @@ public:
use_volume = false;
use_integrator_branched = false;
use_patch_evaluation = false;
+ use_transparent = false;
}
bool modified(const DeviceRequestedFeatures& requested_features)
@@ -148,7 +152,8 @@ public:
use_subsurface == requested_features.use_subsurface &&
use_volume == requested_features.use_volume &&
use_integrator_branched ==
requested_features.use_integrator_branched &&
-use_patch_evaluation ==
requested_features.use_patch_evaluation);
+use_patch_evaluation ==
requested_features.use_patch_evaluation &&
+use_transparent == requested_features.use_transparent);
}
/* Convert the requested features structure to a build options,
@@ -189,6 +194,9 @@ public:
if(!use_patch_evaluation) {
build_options += " -D__NO_PATCH_EVAL__";
}
+ if(!use_transparent) {
+ build_options += " -D__NO_TRANSPARENT__";
+ }
return build_options;
}
};
diff --git a/intern/cycles/kernel/kernel_types.h
b/intern/cycles/kernel/kernel_types.h
index a6c31d4..fd96183 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -192,6 +192,9 @@ CCL_NAMESPACE_BEGIN
#ifdef __NO_PATCH_EVAL__
# undef __PATCH_EVAL__
#endif
+#ifdef __NO_TRANSPARENT__
+# undef __TRANSPARENT_SHADOWS__
+#endif
/* Random Numbers */
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 8e90224..3372104 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -636,6 +636,7 @@ DeviceRequestedFeatures
Session::get_requested_device_features()
BakeManager *bake_manager = scene->bake_manager;
requested_features.use_baking = bake_manager->get_baking();
requested_features.use_integrator_branched = (scene->integrator->method
== Integrator::BRANCHED_PATH);
+ requested_features.use_transparent &=
scene->integrator->transparent_shadows;
return requested_features;
}
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 06b6dd9..335edcb 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -571,6 +571,9 @@ void
ShaderManager::get_requested_graph_features(ShaderGraph *graph,
if(node->has_surface_bssrdf()) {
requested_features->use_subsurface = true;
}
+ if(node->has_surface_transparent()) {
+ requested_features->use_transparent = true;
+ }
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [923eae2] master: [msvc] Changes for new oiio/ffmpeg versions.
Commit: 923eae25d1abf7b93edf553982877672f6259dcb
Author: lazydodo
Date: Sat Dec 3 17:38:20 2016 -0700
Branches: master
https://developer.blender.org/rB923eae25d1abf7b93edf553982877672f6259dcb
[msvc] Changes for new oiio/ffmpeg versions.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
M source/creator/CMakeLists.txt
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 96c9ec9..3b50351 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -238,14 +238,14 @@ if(WITH_CODEC_FFMPEG)
windows_find_package(FFMPEG)
if(NOT FFMPEG_FOUND)
warn_hardcoded_paths(ffmpeg)
- set(FFMPEG_LIBRARY_VERSION 55)
- set(FFMPEG_LIBRARY_VERSION_AVU 52)
+ set(FFMPEG_LIBRARY_VERSION 57)
+ set(FFMPEG_LIBRARY_VERSION_AVU 55)
set(FFMPEG_LIBRARIES
-
${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avdevice-${FFMPEG_LIBRARY_VERSION}.lib
-
${LIBDIR}/ffmpeg/lib/avutil-${FFMPEG_LIBRARY_VERSION_AVU}.lib
- ${LIBDIR}/ffmpeg/lib/swscale-2.lib
+ ${LIBDIR}/ffmpeg/lib/avcodec.lib
+ ${LIBDIR}/ffmpeg/lib/avformat.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice.lib
+ ${LIBDIR}/ffmpeg/lib/avutil.lib
+ ${LIBDIR}/ffmpeg/lib/swscale.lib
)
endif()
endif()
@@ -380,6 +380,7 @@ if(WITH_OPENIMAGEIO)
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
add_definitions(-DOIIO_STATIC_BUILD)
+ add_definitions(-DOIIO_NO_SSE=1)
endif()
if(WITH_LLVM)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 04a79f6..eea4554 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -713,10 +713,7 @@ elseif(WIN32)
)
if(WITH_PYTHON_INSTALL_NUMPY)
- set(PYTHON_NUMPY_VERSION 1.9)
- if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION
EQUAL 1910))
- set(PYTHON_NUMPY_VERSION 1.11)
- endif()
+ set(PYTHON_NUMPY_VERSION 1.10)
add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
COMMAND ${CMAKE_COMMAND} -E
make_directory
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -830,11 +827,12 @@ elseif(WIN32)
else()
install(
FILES
- ${LIBDIR}/ffmpeg/lib/avcodec-55.dll
- ${LIBDIR}/ffmpeg/lib/avformat-55.dll
- ${LIBDIR}/ffmpeg/lib/avdevice-55.dll
- ${LIBDIR}/ffmpeg/lib/avutil-52.dll
- ${LIBDIR}/ffmpeg/lib/swscale-2.dll
+ ${LIBDIR}/ffmpeg/lib/avcodec-57.dll
+ ${LIBDIR}/ffmpeg/lib/avformat-57.dll
+ ${LIBDIR}/ffmpeg/lib/avdevice-57.dll
+ ${LIBDIR}/ffmpeg/lib/avutil-55.dll
+ ${LIBDIR}/ffmpeg/lib/swscale-4.dll
+ ${LIBDIR}/ffmpeg/lib/swresample-2.dll
DESTINATION "."
)
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [05b181f] master: Fix T46795 : Reset GWLP_USERDATA to NULL at window destruction so any future events will not try to reference this deleted class.
Commit: 05b181fbc55ae9eac82d15e9abd45d32a2f386d8 Author: lazydodo Date: Wed Nov 30 18:26:25 2016 -0700 Branches: master https://developer.blender.org/rB05b181fbc55ae9eac82d15e9abd45d32a2f386d8 Fix T46795 : Reset GWLP_USERDATA to NULL at window destruction so any future events will not try to reference this deleted class. === M intern/ghost/intern/GHOST_WindowWin32.cpp === diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 2aa950f8..7d80aa4 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -353,7 +353,7 @@ GHOST_WindowWin32::~GHOST_WindowWin32() // Release our reference of the DropTarget and it will delete itself eventually. m_dropTarget->Release(); } - + ::SetWindowLongPtr(m_hWnd, GWLP_USERDATA, NULL); ::DestroyWindow(m_hWnd); m_hWnd = 0; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9bea39c] master: [msvc] remove /opt all together and revert to the default behavior /opt:ref for release builds, /opt:noref for debug builds.
Commit: 9bea39c474f768ce6559dfe0315157db6e16f44c
Author: lazydodo
Date: Mon Nov 28 19:55:07 2016 -0700
Branches: master
https://developer.blender.org/rB9bea39c474f768ce6559dfe0315157db6e16f44c
[msvc] remove /opt all together and revert to the default behavior /opt:ref for
release builds, /opt:noref for debug builds.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index d630ae7..96c9ec9 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -112,7 +112,7 @@ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}
/ignore:4221")
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:REF ${PLATFORM_LINKFLAGS}")
+ set(PLATFORM_LINKFLAGS "/MACHINE:X64 ${PLATFORM_LINKFLAGS}")
else()
set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE
${PLATFORM_LINKFLAGS}")
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [6278adc] master: [msvc] change linker options from /opt:noref to /opt:ref, saves about 20% off the executable size
Commit: 6278adc3cab7911d11b64f3ae795dc527041343d
Author: lazydodo
Date: Mon Nov 28 13:22:10 2016 -0700
Branches: master
https://developer.blender.org/rB6278adc3cab7911d11b64f3ae795dc527041343d
[msvc] change linker options from /opt:noref to /opt:ref, saves about 20% off
the executable size
Nobody appears to know why this option was on (and just on for just x64 at that)
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 6ca0568..d630ae7 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -112,7 +112,7 @@ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}
/ignore:4221")
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}")
+ set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:REF ${PLATFORM_LINKFLAGS}")
else()
set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE
${PLATFORM_LINKFLAGS}")
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [df68783] master: [msvc2017] remove eigen vector workaround for msvc2017.
Commit: df687837f822352de3a052b0abc8e1976c583aef
Author: lazydodo
Date: Mon Nov 28 10:12:21 2016 -0700
Branches: master
https://developer.blender.org/rBdf687837f822352de3a052b0abc8e1976c583aef
[msvc2017] remove eigen vector workaround for msvc2017.
===
M extern/Eigen3/Eigen/src/StlSupport/StdVector.h
===
diff --git a/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
b/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
index 611664a..1894af6 100644
--- a/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
+++ b/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
@@ -77,7 +77,7 @@ namespace std {
void resize(size_type new_size)
{ resize(new_size, T()); }
-#if defined(_VECTOR_)
+#if defined(_VECTOR_) && (_MSC_VER<1910)
// workaround MSVC std::vector implementation
void resize(size_type new_size, const value_type& x)
{
@@ -110,7 +110,7 @@ namespace std {
vector_base::insert(vector_base::end(), new_size - vector_base::size(),
x);
}
#else
- // either GCC 4.1 or non-GCC
+ // either GCC 4.1, MSVC2017 or non-GCC
// default implementation which should always work.
void resize(size_type new_size, const value_type& x)
{
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [ce3cae8] master: [msvc2015] Fix cmake warnings regarding backslashes in path of the run-time libraries
Commit: ce3cae81f67243b6d87d32c14dc84be57c969026
Author: lazydodo
Date: Sat Nov 26 17:00:25 2016 -0700
Branches: master
https://developer.blender.org/rBce3cae81f67243b6d87d32c14dc84be57c969026
[msvc2015] Fix cmake warnings regarding backslashes in path of the run-time
libraries
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index aa0a213..04a79f6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1185,7 +1185,7 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
message(FATAL_ERROR "Windows 10 SDK directory
not found")
endif()
endif()
-
+ FILE(TO_CMAKE_PATH ${KITSPATH} KITSPATH)
install(
FILES
${KITSPATH}/api-ms-win-core-file-l1-2-0.dll
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [265e5de] master: Fix T50104, Race condition in SVMShaderManager::device_update_shader
Commit: 265e5def76cc08f633e8851236af1ee903d87ff0 Author: lazydodo Date: Fri Nov 25 12:02:37 2016 -0700 Branches: master https://developer.blender.org/rB265e5def76cc08f633e8851236af1ee903d87ff0 Fix T50104, Race condition in SVMShaderManager::device_update_shader === M intern/cycles/render/svm.cpp === diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index 9d3f49a..955b892 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -71,14 +71,13 @@ void SVMShaderManager::device_update_shader(Scene *scene, scene->light_manager->need_update = true; } - /* We only calculate offset and do re-allocation from the locked block, -* actual copy we do after the lock is releases to hopefully gain some -* percent of performance. + /* The copy needs to be done inside the lock, if another thread resizes the array +* while memcpy is running, it'll be copying into possibly invalid/freed ram. */ nodes_lock_.lock(); size_t global_nodes_size = global_svm_nodes->size(); global_svm_nodes->resize(global_nodes_size + svm_nodes.size()); - nodes_lock_.unlock(); + /* Offset local SVM nodes to a global address space. */ int4& jump_node = global_svm_nodes->at(shader->id); jump_node.y = svm_nodes[0].y + global_nodes_size - 1; @@ -88,6 +87,7 @@ void SVMShaderManager::device_update_shader(Scene *scene, memcpy(_svm_nodes->at(global_nodes_size), _nodes[1], sizeof(int4) * (svm_nodes.size() - 1)); + nodes_lock_.unlock(); } void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [16e2c0e] master: [MSVC] Preliminary VS2017 support.
Commit: 16e2c0ef3c08b3a5d81ab21a71fc3c4c37e47e81
Author: lazydodo
Date: Wed Nov 16 20:13:58 2016 -0700
Branches: master
https://developer.blender.org/rB16e2c0ef3c08b3a5d81ab21a71fc3c4c37e47e81
[MSVC] Preliminary VS2017 support.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
M make.bat
M source/creator/CMakeLists.txt
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 5efda52..6ca0568 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -129,8 +129,10 @@ if(NOT DEFINED LIBDIR)
message(STATUS "32 bit compiler detected.")
set(LIBDIR_BASE "windows")
endif()
-
- if(MSVC_VERSION EQUAL 1900)
+ if(MSVC_VERSION EQUAL 1910)
+ message(STATUS "Visual Studio 2017 detected.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
+ elseif(MSVC_VERSION EQUAL 1900)
message(STATUS "Visual Studio 2015 detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
else()
diff --git a/make.bat b/make.bat
index 74148e5..f3ec646 100644
--- a/make.bat
+++ b/make.bat
@@ -61,6 +61,9 @@ if NOT "%1" == "" (
set BUILD_ARCH=x86
) else if "%1" == "x64" (
set BUILD_ARCH=x64
+ ) else if "%1" == "2017" (
+ set BUILD_VS_VER=15
+ set BUILD_VS_YEAR=2017
) else if "%1" == "2015" (
set BUILD_VS_VER=14
set BUILD_VS_YEAR=2015
@@ -140,7 +143,7 @@ if "%target%"=="Release" (
)
:DetectMSVC
-REM Detect MSVC Installation
+REM Detect MSVC Installation for 2013-2015
if DEFINED VisualStudioVersion goto msvc_detect_finally
set VALUE_NAME=ProductDir
REM Check 64 bits
@@ -153,7 +156,18 @@ for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY
%KEY_NAME% /v %VALUE_NAM
if DEFINED MSVC_VC_DIR goto msvc_detect_finally
:msvc_detect_finally
if DEFINED MSVC_VC_DIR call "%MSVC_VC_DIR%\vcvarsall.bat"
+if DEFINED MSVC_VC_DIR goto sanity_checks
+rem MSVC Build environment 2017 and up.
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY
"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SXS\VS7" /v
%BUILD_VS_VER%.0 2^>nul`) DO set MSVC_VS_DIR=%%C
+if DEFINED MSVC_VS_DIR goto msvc_detect_finally_2017
+REM Check 32 bits
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY
"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\sxs\vs7" /v
%BUILD_VS_VER%.0 2^>nul`) DO set MSVC_VS_DIR=%%C
+if DEFINED MSVC_VS_DIR goto msvc_detect_finally_2017
+:msvc_detect_finally_2017
+if DEFINED MSVC_VS_DIR call "%MSVC_VS_DIR%\Common7\Tools\VsDevCmd.bat"
+
+:sanity_checks
REM Sanity Checks
where /Q msbuild
if %ERRORLEVEL% NEQ 0 (
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 10af0d5..aa0a213 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -714,7 +714,7 @@ elseif(WIN32)
if(WITH_PYTHON_INSTALL_NUMPY)
set(PYTHON_NUMPY_VERSION 1.9)
- if(MSVC_VERSION EQUAL 1900)
+ if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION
EQUAL 1910))
set(PYTHON_NUMPY_VERSION 1.11)
endif()
add_custom_command(OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0de157a] master: FIX T49899: Add EIGEN_MAKE_ALIGNED_OPERATOR_NEW to classes that use eigen's data types , to force aligned on 16 byte boundaries.
Commit: 0de157a3204206a5d0d90daa00e7c6648e3c9674
Author: lazydodo
Date: Tue Nov 15 13:21:01 2016 -0700
Branches: master
https://developer.blender.org/rB0de157a3204206a5d0d90daa00e7c6648e3c9674
FIX T49899: Add EIGEN_MAKE_ALIGNED_OPERATOR_NEW to classes that use eigen's
data types , to force aligned on 16 byte boundaries.
===
M intern/iksolver/intern/IK_QSegment.h
M intern/iksolver/intern/IK_Solver.cpp
===
diff --git a/intern/iksolver/intern/IK_QSegment.h
b/intern/iksolver/intern/IK_QSegment.h
index 74f157a..247807d 100644
--- a/intern/iksolver/intern/IK_QSegment.h
+++ b/intern/iksolver/intern/IK_QSegment.h
@@ -60,6 +60,7 @@
class IK_QSegment
{
public:
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
virtual ~IK_QSegment();
// start: a user defined translation
diff --git a/intern/iksolver/intern/IK_Solver.cpp
b/intern/iksolver/intern/IK_Solver.cpp
index cefb8c7..a00db4f 100644
--- a/intern/iksolver/intern/IK_Solver.cpp
+++ b/intern/iksolver/intern/IK_Solver.cpp
@@ -42,6 +42,7 @@ using namespace std;
class IK_QSolver {
public:
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
IK_QSolver() : root(NULL) {
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [818af9c] master: MSVC Runtime copy : Remove erroneously left in diagnostic message from CMakeLists.txt
Commit: 818af9c3315cb883436a3d75d634f449133cd3d9
Author: lazydodo
Date: Sat Nov 5 14:04:23 2016 -0600
Branches: master
https://developer.blender.org/rB818af9c3315cb883436a3d75d634f449133cd3d9
MSVC Runtime copy : Remove erroneously left in diagnostic message from
CMakeLists.txt
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 187df26..10af0d5 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1218,6 +1218,5 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
DESTINATION "."
)
endif()
- Message("KITSPATH = ${KITSPATH}")
endif()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [2b1d331] master: [msvc2015] Add support for copying the vc runtime.
Commit: 2b1d3318f4c5a8f80f46dbb25ceb80eb86e9fcdc
Author: lazydodo
Date: Sat Nov 5 13:58:32 2016 -0600
Branches: master
https://developer.blender.org/rB2b1d3318f4c5a8f80f46dbb25ceb80eb86e9fcdc
[msvc2015] Add support for copying the vc runtime.
There's more dll's hanging out in the ucrt folder, but I just grabbed the ones
blender requested (not sure if that's a wise idea, but it seems to work)
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D2335
===
M source/creator/CMakeLists.txt
===
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f65688e..187df26 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1153,13 +1153,12 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
COMPONENT Blender
DESTINATION "."
)
-
+ if(CMAKE_CL_64)
+ set(_WIN_PLATFORM x64)
+ else()
+ set(_WIN_PLATFORM x86)
+ endif()
if(MSVC12_REDIST_DIR)
- if(CMAKE_CL_64)
- set(_WIN_PLATFORM x64)
- else()
- set(_WIN_PLATFORM x86)
- endif()
install(
FILES
${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcp120.dll
@@ -1173,4 +1172,52 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
)
endif()
endif()
+
+ if(MSVC14_REDIST_DIR)
+ set(KITSDIRx86 "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/")
+ set(KITSDIR "$ENV{ProgramFiles}/Windows Kits/10/")
+ if(IS_DIRECTORY ${KITSDIR})
+ set(KITSPATH
"${KITSDIR}/Redist/ucrt/DLLs/${_WIN_PLATFORM}")
+ else()
+ if(IS_DIRECTORY ${KITSDIRx86})
+ set(KITSPATH
"${KITSDIRx86}/Redist/ucrt/DLLs/${_WIN_PLATFORM}")
+ else()
+ message(FATAL_ERROR "Windows 10 SDK directory
not found")
+ endif()
+ endif()
+
+ install(
+ FILES
+ ${KITSPATH}/api-ms-win-core-file-l1-2-0.dll
+ ${KITSPATH}/api-ms-win-core-file-l2-1-0.dll
+
${KITSPATH}/api-ms-win-core-localization-l1-2-0.dll
+
${KITSPATH}/api-ms-win-core-processthreads-l1-1-0.dll
+
${KITSPATH}/api-ms-win-core-processthreads-l1-1-1.dll
+ ${KITSPATH}/api-ms-win-core-synch-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-core-synch-l1-2-0.dll
+ ${KITSPATH}/api-ms-win-core-timezone-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-conio-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-convert-l1-1-0.dll
+
${KITSPATH}/api-ms-win-crt-environment-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-filesystem-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-heap-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-locale-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-math-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-process-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-runtime-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-stdio-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-string-l1-1-0.dll
+ ${KITSPATH}/api-ms-win-crt-time-l1-1-0.dll
+ ${KITSPATH}/ucrtbase.dll
+
${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.CRT/vcruntime140.dll
+ DESTINATION "."
+ )
+ if(WITH_OPENMP)
+ install(
+ FILES
${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.OpenMP/vcomp140.dll
+ DESTINATION "."
+ )
+ endif()
+ Message("KITSPATH = ${KITSPATH}")
+ endif()
endif()
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f94a460] master: [msvc/make.bat] Detect spaces in the build path and error out.
Commit: f94a460397a86beb9f71e665e8f484fa4e10ebdc Author: lazydodo Date: Tue Nov 1 15:30:12 2016 -0600 Branches: master https://developer.blender.org/rBf94a460397a86beb9f71e665e8f484fa4e10ebdc [msvc/make.bat] Detect spaces in the build path and error out. === M make.bat === diff --git a/make.bat b/make.bat index c7f2dbb..74148e5 100644 --- a/make.bat +++ b/make.bat @@ -4,6 +4,11 @@ REM This is for users who like to configure & build Blender with a single comman setlocal ENABLEEXTENSIONS set BLENDER_DIR=%~dp0 +set BLENDER_DIR_NOSPACES=%BLENDER_DIR: =% +if not "%BLENDER_DIR%"=="%BLENDER_DIR_NOSPACES%" ( + echo There are spaces detected in the build path "%BLENDER_DIR%", this is currently not supported, exiting + goto EOF +) set BUILD_DIR=%BLENDER_DIR%..\build_windows set BUILD_TYPE=Release rem reset all variables so they do not get accidentally get carried over from previous builds ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [47ac6aa] fluid-mantaflow: Mantaflow: Fix typo in smoke_export_low script.
Commit: 47ac6aa864adc6e286261ecf4a636b6c2fdcdd60 Author: lazydodo Date: Sat Oct 29 13:26:29 2016 -0600 Branches: fluid-mantaflow https://developer.blender.org/rB47ac6aa864adc6e286261ecf4a636b6c2fdcdd60 Mantaflow: Fix typo in smoke_export_low script. === M intern/mantaflow/intern/strings/smoke_script.h === diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index 661d638..b23e360 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -379,7 +379,7 @@ def load_smoke_data_high(path):\n\ const std::string smoke_export_low = "\n\ def save_smoke_data_low(path):\n\ path = Path(path)\n\ -density.save(path / 'density.uni'))\n\ +density.save(path / 'density.uni')\n\ flags.save(path / 'flags.uni')\n\ vel.save(path / 'vel.uni')\n\ forces.save(path / 'forces.uni')\n\ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [bc71c2b] master: [msvc] make.bat - create a build.log in the build directory
Commit: bc71c2bf08d887ded44243ba93447e0bea493745 Author: lazydodo Date: Tue Oct 25 11:49:08 2016 -0600 Branches: master https://developer.blender.org/rBbc71c2bf08d887ded44243ba93447e0bea493745 [msvc] make.bat - create a build.log in the build directory === M make.bat === diff --git a/make.bat b/make.bat index 11c1ff0..c7f2dbb 100644 --- a/make.bat +++ b/make.bat @@ -225,7 +225,8 @@ msbuild ^ /property:Configuration=%BUILD_TYPE% ^ /maxcpucount ^ /verbosity:minimal ^ - /p:platform=%MSBUILD_PLATFORM% + /p:platform=%MSBUILD_PLATFORM% ^ + /flp:Summary;Verbosity=minimal;LogFile=%BUILD_DIR%\Build.log if %ERRORLEVEL% NEQ 0 ( echo "Build Failed" ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [53cbda0] blender-v2.78-release: Fix T49793 : Fix enabling SSE2 globally for msvc.
Commit: 53cbda0f7f04f4b3b36df8d84d246f9f5138167b
Author: lazydodo
Date: Wed Oct 19 10:06:45 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rB53cbda0f7f04f4b3b36df8d84d246f9f5138167b
Fix T49793 : Fix enabling SSE2 globally for msvc.
When feeding msvc both /arch:sse2 and /arch:sse it's not smart enough to pick
the best option, just goes with the last option
===
M CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9331418..578f913 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -974,7 +974,7 @@ if(SUPPORT_SSE_BUILD)
add_definitions(-D__SSE__ -D__MMX__)
endif()
if(SUPPORT_SSE2_BUILD)
- set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
+ set(PLATFORM_CFLAGS " ${PLATFORM_CFLAGS} ${COMPILER_SSE2_FLAG}")
add_definitions(-D__SSE2__)
if(NOT SUPPORT_SSE_BUILD) # dont double up
add_definitions(-D__MMX__)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [395568d] fluid-mantaflow: change path's to literal strings, to prevent escape issues with windows paths.
Commit: 395568ddae61fc2d1ea504f61a29b96e79b50952
Author: lazydodo
Date: Thu Oct 20 13:00:55 2016 -0600
Branches: fluid-mantaflow
https://developer.blender.org/rB395568ddae61fc2d1ea504f61a29b96e79b50952
change path's to literal strings, to prevent escape issues with windows paths.
===
M intern/mantaflow/intern/FLUID.cpp
===
diff --git a/intern/mantaflow/intern/FLUID.cpp
b/intern/mantaflow/intern/FLUID.cpp
index 281d504..6f70cf1 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -983,7 +983,7 @@ void FLUID::saveMesh(char *filename)
mCommands.clear();
std::ostringstream save_mesh_low;
- save_mesh_low << "save_mesh_low('" << path << "')";
+ save_mesh_low << "save_mesh_low(r'" << path << "')";
mCommands.push_back(save_mesh_low.str());
runPythonString(mCommands);
@@ -996,7 +996,7 @@ void FLUID::saveMeshHigh(char *filename)
mCommands.clear();
std::ostringstream save_mesh_high;
- save_mesh_high << "save_mesh_high('" << path << "')";
+ save_mesh_high << "save_mesh_high(r'" << path << "')";
mCommands.push_back(save_mesh_high.str());
runPythonString(mCommands);
@@ -1008,7 +1008,7 @@ void FLUID::saveSmokeData(char *pathname)
mCommands.clear();
std::ostringstream save_smoke_data_low;
- save_smoke_data_low << "save_smoke_data_low('" << path << "')";
+ save_smoke_data_low << "save_smoke_data_low(r'" << path << "')";
mCommands.push_back(save_smoke_data_low.str());
runPythonString(mCommands);
@@ -1020,7 +1020,7 @@ void FLUID::saveSmokeDataHigh(char *pathname)
mCommands.clear();
std::ostringstream save_smoke_data_high;
- save_smoke_data_high << "save_smoke_data_high('" << path << "')";
+ save_smoke_data_high << "save_smoke_data_high(r'" << path << "')";
mCommands.push_back(save_smoke_data_high.str());
runPythonString(mCommands);
@@ -1032,7 +1032,7 @@ void FLUID::saveLiquidData(char *pathname)
mCommands.clear();
std::ostringstream save_liquid_data_low;
- save_liquid_data_low << "save_liquid_data_low('" << path << "')";
+ save_liquid_data_low << "save_liquid_data_low(r'" << path << "')";
mCommands.push_back(save_liquid_data_low.str());
runPythonString(mCommands);
@@ -1044,7 +1044,7 @@ void FLUID::saveLiquidDataHigh(char *pathname)
mCommands.clear();
std::ostringstream save_liquid_data_high;
- save_liquid_data_high << "save_liquid_data_high('" << path << "')";
+ save_liquid_data_high << "save_liquid_data_high(r'" << path << "')";
mCommands.push_back(save_liquid_data_high.str());
runPythonString(mCommands);
@@ -1056,7 +1056,7 @@ void FLUID::loadLiquidData(char *pathname)
mCommands.clear();
std::ostringstream load_liquid_data_low;
- load_liquid_data_low << "load_liquid_data_low('" << path << "')";
+ load_liquid_data_low << "load_liquid_data_low(r'" << path << "')";
mCommands.push_back(load_liquid_data_low.str());
runPythonString(mCommands);
@@ -1068,7 +1068,7 @@ void FLUID::loadLiquidDataHigh(char *pathname)
mCommands.clear();
std::ostringstream load_liquid_data_high;
- load_liquid_data_high << "load_liquid_data_high('" << path << "')";
+ load_liquid_data_high << "load_liquid_data_high(r'" << path << "')";
mCommands.push_back(load_liquid_data_high.str());
runPythonString(mCommands);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [789ea73] master: Fix T49793 : Fix enabling SSE2 globally for msvc.
Commit: 789ea7397fd80dc5ab63d86719880f355bb440ae
Author: lazydodo
Date: Wed Oct 19 10:06:45 2016 -0600
Branches: master
https://developer.blender.org/rB789ea7397fd80dc5ab63d86719880f355bb440ae
Fix T49793 : Fix enabling SSE2 globally for msvc.
When feeding msvc both /arch:sse2 and /arch:sse it's not smart enough to pick
the best option, just goes with the last option
===
M CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64fd2c5..c7addc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -986,7 +986,7 @@ if(SUPPORT_SSE_BUILD)
add_definitions(-D__SSE__ -D__MMX__)
endif()
if(SUPPORT_SSE2_BUILD)
- set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
+ set(PLATFORM_CFLAGS " ${PLATFORM_CFLAGS} ${COMPILER_SSE2_FLAG}")
add_definitions(-D__SSE2__)
if(NOT SUPPORT_SSE_BUILD) # dont double up
add_definitions(-D__MMX__)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [82f842c] master: [msvc] Minor cleanup in blenkernel.
Commit: 82f842c27f4ff483be0fda6c02d3a4527cc20ff2 Author: lazydodo Date: Tue Oct 18 09:25:14 2016 -0600 Branches: master https://developer.blender.org/rB82f842c27f4ff483be0fda6c02d3a4527cc20ff2 [msvc] Minor cleanup in blenkernel. this patch resolves the following warnings; ``` Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 764 Warning C4098 'attach_stabilization_baseline_data': 'void' function returning a value blenkernel\intern\tracking_stabilize.c 139 Warning C4028 formal parameter 3 different from declaration blenkernel\intern\cachefile.c 148 Warning C4028 formal parameter 3 different from declaration blenkernel\intern\paint.c 413 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\editderivedmesh.c 591 Warning C4028 formal parameter 3 different from declaration blenkernel\intern\library_remap.c 709 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 754 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 758 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 759 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 763 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 764 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 765 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 769 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\ocean.c 770 Warning C4028 formal parameter 1 different from declaration blenkernel\intern\DerivedMesh.c 3458 ``` It's mostly things where the signature in the .h and the actual implementation in the .c do not match. And a bunch functions who do not match the TaskRunFunction declaration cause they leave out the __restrict keyword. Reviewers: brecht, juicyfruit, sergey Reviewed By: sergey Subscribers: Blendify Differential Revision: https://developer.blender.org/D2268 === M source/blender/blenkernel/BKE_cachefile.h M source/blender/blenkernel/BKE_library.h M source/blender/blenkernel/intern/DerivedMesh.c M source/blender/blenkernel/intern/editderivedmesh.c M source/blender/blenkernel/intern/ocean.c M source/blender/blenkernel/intern/paint.c M source/blender/blenkernel/intern/tracking_stabilize.c === diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h index b30143c..a55cb51 100644 --- a/source/blender/blenkernel/BKE_cachefile.h +++ b/source/blender/blenkernel/BKE_cachefile.h @@ -55,7 +55,7 @@ void BKE_cachefile_reload(const struct Main *bmain, struct CacheFile *cache_file void BKE_cachefile_ensure_handle(const struct Main *bmain, struct CacheFile *cache_file); -void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene, float ctime, const float fps); +void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene,const float ctime, const float fps); bool BKE_cachefile_filepath_get( const struct Main *bmain, const struct CacheFile *cache_file, float frame, diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index e49019f..0d82de0 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -64,7 +64,7 @@ struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_ /* library_remap.c (keep here since they're general functions) */ void BKE_libblock_free(struct Main *bmain, void *idv) ATTR_NONNULL(); -void BKE_libblock_free_ex(struct Main *bmain, void *idv, bool do_id_user) ATTR_NONNULL(); +void BKE_libblock_free_ex(struct Main *bmain, void *idv, const bool do_id_user) ATTR_NONNULL(); void BKE_libblock_free_us(struct Main *bmain, void *idv) ATTR_NONNULL(); void BKE_libblock_free_data(struct Main *bmain, struct ID *id) ATTR_NONNULL(); void BKE_libblock_delete(struct Main *bmain, void *idv) ATTR_NONNULL(); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index f75b3c0..ae18f52 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3256,7 +3256,7 @@ void DM_calc_tangents_names_from_gpu( *r_tangent_names_count = count; } -static void DM_calc_loop_tangents_thread(TaskPool *UNUSED(pool), void *taskdata, int UNUSED(threadid)) +static void DM_calc_loop_tangents_thread(TaskPool
[Bf-blender-cvs] [3541f7c] master: [windows] Create A Blender Desktop Shortcut in the msi installer , fixes T49522
Commit: 3541f7c47d8e709731089bd139d7edc4f410f772 Author: lazydodo Date: Tue Oct 18 09:21:58 2016 -0600 Branches: master https://developer.blender.org/rB3541f7c47d8e709731089bd139d7edc4f410f772 [windows] Create A Blender Desktop Shortcut in the msi installer , fixes T49522 === M build_files/cmake/packaging.cmake === diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 1563331..c7063ed 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -97,6 +97,8 @@ if(WIN32) endif() set(CPACK_PACKAGE_EXECUTABLES "blender" "blender") +set(CPACK_CREATE_DESKTOP_LINKS "blender" "blender") + include(CPack) # Target for build_archive.py script, to automatically pass along ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [4f1f949] master: [msvc] make.bat, no need to set the cuda path at all, cmake will figure it out on it's own.
Commit: 4f1f9498777dec3740df86b236d24a527db3f183 Author: lazydodo Date: Tue Oct 4 13:30:38 2016 -0600 Branches: master https://developer.blender.org/rB4f1f9498777dec3740df86b236d24a527db3f183 [msvc] make.bat, no need to set the cuda path at all, cmake will figure it out on it's own. === M make.bat === diff --git a/make.bat b/make.bat index ad04687..11c1ff0 100644 --- a/make.bat +++ b/make.bat @@ -131,7 +131,7 @@ if "%target%"=="Release" ( goto EOF ) set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ - -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" -DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH%/bin/nvcc.exe + -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" ) :DetectMSVC ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [cd320db] master: [msvc] make.bat remove mixed cuda 7.5/8.0 build for release since all kernels can now be properly build with 8.0
Commit: cd320dbfba4a17ce1c1a084fbda417ed58c90391 Author: lazydodo Date: Tue Oct 4 11:51:04 2016 -0600 Branches: master https://developer.blender.org/rBcd320dbfba4a17ce1c1a084fbda417ed58c90391 [msvc] make.bat remove mixed cuda 7.5/8.0 build for release since all kernels can now be properly build with 8.0 === M make.bat === diff --git a/make.bat b/make.bat index 0220758..ad04687 100644 --- a/make.bat +++ b/make.bat @@ -126,24 +126,12 @@ set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% if "%target%"=="Release" ( rem for vc12 check for both cuda 7.5 and 8 - if "%BUILD_VS_VER%"=="12" ( - if "%CUDA_PATH_V7_5%"=="" ( - echo Cuda 7.5 Not found, aborting! - goto EOF - ) - ) - if "%CUDA_PATH_V8_0%"=="" ( - echo Cuda 8.0 Not found, aborting! + if "%CUDA_PATH%"=="" ( + echo Cuda Not found, aborting! goto EOF ) - if "%BUILD_VS_VER%"=="12" ( - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ - -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" -DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH_V7_5%/bin/nvcc.exe -DCUDA_NVCC8_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe - ) - if "%BUILD_VS_VER%"=="14" ( - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ - -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" -DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe -DCUDA_NVCC8_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe - ) + set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ + -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" -DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH%/bin/nvcc.exe ) :DetectMSVC ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [3ee5ce1] master: [Windows/Cycles/Clang] Fix compilation error with clang-cl on windows
Commit: 3ee5ce155c4cc3f705038a12484351d21a71441d
Author: lazydodo
Date: Sun Oct 2 14:01:23 2016 -0600
Branches: master
https://developer.blender.org/rB3ee5ce155c4cc3f705038a12484351d21a71441d
[Windows/Cycles/Clang] Fix compilation error with clang-cl on windows
===
M intern/cycles/util/util_simd.h
===
diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index 36da155..8d4d790 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -71,7 +71,7 @@ __forceinline operator int ( ) const { return
std::numeric_limits<
#define _lzcnt_u64 __lzcnt64
#endif
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__)
__forceinline int __popcnt(int in) {
return _mm_popcnt_u32(in);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [11e93c5] master: [msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected.
Commit: 11e93c5f2bd58db3079cf62654eae47fd2546721 Author: lazydodo Date: Sat Oct 1 11:21:42 2016 -0600 Branches: master https://developer.blender.org/rB11e93c5f2bd58db3079cf62654eae47fd2546721 [msvc] make.bat - Fix:msbuild platform wasn't set when the architecture was auto detected. === M make.bat === diff --git a/make.bat b/make.bat index fb3b4b8..0220758 100644 --- a/make.bat +++ b/make.bat @@ -105,10 +105,8 @@ if "%BUILD_ARCH%"=="" ( ) ) else if "%BUILD_ARCH%"=="x64" ( set WINDOWS_ARCH= Win64 - set MSBUILD_PLATFORM=x64 ) else if "%BUILD_ARCH%"=="x86" ( set WINDOWS_ARCH= - set MSBUILD_PLATFORM=win32 ) if "%BUILD_VS_VER%"=="" ( @@ -116,6 +114,13 @@ if "%BUILD_VS_VER%"=="" ( set BUILD_VS_YEAR=2013 ) +if "%BUILD_ARCH%"=="x64" ( + set MSBUILD_PLATFORM=x64 + ) else if "%BUILD_ARCH%"=="x86" ( + set MSBUILD_PLATFORM=win32 +) + + set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [4a42386] master: [MSVC] Make.bat updates. - Explicitly specify the platform for msbuild, to facilitate builds with just the Visual C++ Build Tools installed. - When vs2013 is not fou
Commit: 4a423862e9fe405f31168f9a1355d6727e7ad923 Author: lazydodo Date: Sat Oct 1 10:22:28 2016 -0600 Branches: master https://developer.blender.org/rB4a423862e9fe405f31168f9a1355d6727e7ad923 [MSVC] Make.bat updates. - Explicitly specify the platform for msbuild, to facilitate builds with just the Visual C++ Build Tools installed. - When vs2013 is not found, try looking for 2015 as a fallback - Clear up any batch variables that might have been set from previous runs === M make.bat === diff --git a/make.bat b/make.bat index 709febb..fb3b4b8 100644 --- a/make.bat +++ b/make.bat @@ -6,7 +6,17 @@ setlocal ENABLEEXTENSIONS set BLENDER_DIR=%~dp0 set BUILD_DIR=%BLENDER_DIR%..\build_windows set BUILD_TYPE=Release +rem reset all variables so they do not get accidentally get carried over from previous builds set BUILD_CMAKE_ARGS= +set BUILD_ARCH= +set BUILD_VS_VER= +set BUILD_VS_YEAR= +set KEY_NAME= +set MSBUILD_PLATFORM= +set MUST_CLEAN= +set NOBUILD= +set TARGET= +set WINDOWS_ARCH= :argv_loop if NOT "%1" == "" ( @@ -95,8 +105,10 @@ if "%BUILD_ARCH%"=="" ( ) ) else if "%BUILD_ARCH%"=="x64" ( set WINDOWS_ARCH= Win64 + set MSBUILD_PLATFORM=x64 ) else if "%BUILD_ARCH%"=="x86" ( set WINDOWS_ARCH= + set MSBUILD_PLATFORM=win32 ) if "%BUILD_VS_VER%"=="" ( @@ -129,6 +141,7 @@ if "%target%"=="Release" ( ) ) +:DetectMSVC REM Detect MSVC Installation if DEFINED VisualStudioVersion goto msvc_detect_finally set VALUE_NAME=ProductDir @@ -146,10 +159,18 @@ if DEFINED MSVC_VC_DIR call "%MSVC_VC_DIR%\vcvarsall.bat" REM Sanity Checks where /Q msbuild if %ERRORLEVEL% NEQ 0 ( - echo Error: "MSBuild" command not in the PATH. - echo You must have MSVC installed and run this from the "Developer Command Prompt" - echo ^(available from Visual Studio's Start menu entry^), aborting! - goto EOF + if "%BUILD_VS_VER%"=="12" ( + rem vs12 not found, try vs14 + echo Visual Studio 2012 not found, trying Visual Studio 2015. + set BUILD_VS_VER=14 + set BUILD_VS_YEAR=2015 + goto DetectMSVC + ) else( + echo Error: "MSBuild" command not in the PATH. + echo You must have MSVC installed and run this from the "Developer Command Prompt" + echo ^(available from Visual Studio's Start menu entry^), aborting! + goto EOF + ) ) where /Q cmake if %ERRORLEVEL% NEQ 0 ( @@ -179,7 +200,9 @@ if "%MUST_CLEAN%"=="1" ( %BUILD_DIR%\Blender.sln ^ /target:clean ^ /property:Configuration=%BUILD_TYPE% ^ - /verbosity:minimal + /verbosity:minimal ^ + /p:platform=%MSBUILD_PLATFORM% + if %ERRORLEVEL% NEQ 0 ( echo Cleaned "%BUILD_DIR%" ) @@ -208,7 +231,8 @@ msbuild ^ /target:build ^ /property:Configuration=%BUILD_TYPE% ^ /maxcpucount ^ - /verbosity:minimal + /verbosity:minimal ^ + /p:platform=%MSBUILD_PLATFORM% if %ERRORLEVEL% NEQ 0 ( echo "Build Failed" @@ -218,7 +242,8 @@ if %ERRORLEVEL% NEQ 0 ( msbuild ^ %BUILD_DIR%\INSTALL.vcxproj ^ /property:Configuration=%BUILD_TYPE% ^ - /verbosity:minimal + /verbosity:minimal ^ + /p:platform=%MSBUILD_PLATFORM% echo. echo At any point you can optionally modify your build configuration by editing: ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [78c380d] master: [MSVC] make.bat updates.
Commit: 78c380d3b84d53bf099b49571f0df67bea95bce2 Author: lazydodo Date: Wed Sep 28 19:57:25 2016 -0600 Branches: master https://developer.blender.org/rB78c380d3b84d53bf099b49571f0df67bea95bce2 [MSVC] make.bat updates. - The build folder name used to be depended on the order of the parameters, this is now normalized to "build_windows_[Release/Full/Lite/Headless/Cycles/Bpy]_[x86/x64]_vc[12/14]_[Release/Debug]" regardless of the order of the parameters. -Use CUDA8 for all kernels when building the release convenience target with visual studio 2015 === M make.bat === diff --git a/make.bat b/make.bat index 4f911c3..709febb 100644 --- a/make.bat +++ b/make.bat @@ -18,54 +18,34 @@ if NOT "%1" == "" ( REM Build Types if "%1" == "debug" ( - set BUILD_DIR=%BUILD_DIR%_debug set BUILD_TYPE=Debug - REM Build Configurations ) else if "%1" == "full" ( - set TARGET_SET=1 - set BUILD_DIR=%BUILD_DIR%_full + set TARGET=Full set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_full.cmake" ) else if "%1" == "lite" ( - set TARGET_SET=1 - set BUILD_DIR=%BUILD_DIR%_lite + set TARGET=Lite set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_lite.cmake" ) else if "%1" == "cycles" ( - set TARGET_SET=1 - set BUILD_DIR=%BUILD_DIR%_cycles + set TARGET=Cycles set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\cycles_standalone.cmake" ) else if "%1" == "headless" ( - set TARGET_SET=1 - set BUILD_DIR=%BUILD_DIR%_headless + set TARGET=Headless set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_headless.cmake" ) else if "%1" == "bpy" ( - set TARGET_SET=1 - set BUILD_DIR=%BUILD_DIR%_bpy + set TARGET=Bpy set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake" ) else if "%1" == "release" ( - set TARGET_SET=1 - if "%CUDA_PATH_V7_5%"=="" ( - echo Cuda 7.5 Not found, aborting! - goto EOF - ) - if "%CUDA_PATH_V8_0%"=="" ( - echo Cuda 8.0 Not found, aborting! - goto EOF - ) - set BUILD_DIR=%BUILD_DIR%_Release - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ - -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake" -DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH_V7_5%/bin/nvcc.exe -DCUDA_NVCC8_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe + set TARGET=Release ) else if "%1" == "x86" ( set BUILD_ARCH=x86 - set BUILD_DIR=%BUILD_DIR%_x86 ) else if "%1" == "x64" ( set BUILD_ARCH=x64 - set BUILD_DIR=%BUILD_DIR%_x64 ) else if "%1" == "2015" ( set BUILD_VS_VER=14 set BUILD_VS_YEAR=2015 @@ -105,10 +85,13 @@ if NOT "%1" == "" ( if "%BUILD_ARCH%"=="" ( if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( set WINDOWS_ARCH= Win64 + set BUILD_ARCH=x64 ) else if "%PROCESSOR_ARCHITEW6432%" == "AMD64" ( set WINDOWS_ARCH= Win64 + set BUILD_ARCH=x64 ) else ( set WINDOWS_ARCH= + set BUILD_ARCH=x86 ) ) else if "%BUILD_ARCH%"=="x64" ( set WINDOWS_ARCH= Win64 @@ -121,7 +104,30 @@ if "%BUILD_VS_VER%"=="" ( set BUILD_VS_YEAR=2013 ) -set BUILD_DIR=%BUILD_DIR%_vc%BUILD_VS_VER% +set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE% + + +if "%target%"=="Release" ( + rem for vc12 check for both cuda 7.5 and 8 + if "%BUILD_VS_VER%"=="12" ( + if "%CUDA_PATH_V7_5%"=="" ( +
[Bf-blender-cvs] [f1de438] master: Revert "[Windows/MSVC] Blosc doesn't require debug libraries."
Commit: f1de438bba0fd6b525ea04d094b8a08737144e82
Author: lazydodo
Date: Wed Sep 28 17:27:35 2016 -0600
Branches: master
https://developer.blender.org/rBf1de438bba0fd6b525ea04d094b8a08737144e82
Revert "[Windows/MSVC] Blosc doesn't require debug libraries."
turns out it's a C++ lib now-days and it *DOES* require debug libs.
This reverts commit bde5eb8b6303d8d92b7c41d4a3f041bbb73c162d.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 961cada..5efda52 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -414,7 +414,7 @@ if(WITH_OPENCOLORIO)
endif()
if(WITH_OPENVDB)
- set(BLOSC_LIBRARIES ${LIBDIR}/blosc/lib/libblosc.lib )
+ set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug
${LIBDIR}/blosc/lib/libblosc_d.lib)
set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug
${LIBDIR}/tbb/lib/tbb_debug.lib)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
set(OPENVDB ${LIBDIR}/openvdb)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [26d7d99] master: Fix Windows mouse wheel scroll speed
Commit: 26d7d995dbef20040664372a836d166b0a638ccb
Author: lazydodo
Date: Wed Sep 28 17:19:16 2016 -0600
Branches: master
https://developer.blender.org/rB26d7d995dbef20040664372a836d166b0a638ccb
Fix Windows mouse wheel scroll speed
In Windows, event dispatching code is throwing out the wheel scroll count value.
Despite of how many fast you move the wheel, it only make one-notch scroll
event.
This patch convert wheel event to multiple 1-notch wheel events.
This also correct the handling of smooth scroll mouse wheel (which can report
smaller than 1-notch wheel movement) by accumulating the small wheel delta
values.
Reviewers: djnz, shadowrom, elubie, #platform:_windows, sergey, juicyfruit,
brecht
Reviewed By: shadowrom, elubie, #platform:_windows, brecht
Subscribers: dingto, elubie, brachi, brecht
Differential Revision: https://developer.blender.org/D143
===
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.h
===
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp
b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 60e7815..e436345 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -712,18 +712,26 @@ GHOST_EventCursor
*GHOST_SystemWin32::processCursorEvent(GHOST_TEventType type,
}
-GHOST_EventWheel *GHOST_SystemWin32::processWheelEvent(GHOST_WindowWin32
*window, WPARAM wParam, LPARAM lParam)
+void GHOST_SystemWin32::processWheelEvent(GHOST_WindowWin32 *window, WPARAM
wParam, LPARAM lParam)
{
- // short fwKeys = LOWORD(wParam); // key flags
- int zDelta = (short) HIWORD(wParam);// wheel rotation
-
- // zDelta /= WHEEL_DELTA;
- // temporary fix below: microsoft now has added more precision, making
the above division not work
- zDelta = (zDelta <= 0) ? -1 : 1;
+ GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)getSystem();
- // short xPos = (short) LOWORD(lParam); // horizontal position of
pointer
- // short yPos = (short) HIWORD(lParam); // vertical position of pointer
- return new GHOST_EventWheel(getSystem()->getMilliSeconds(), window,
zDelta);
+ int acc = system->m_wheelDeltaAccum;
+ int delta = GET_WHEEL_DELTA_WPARAM(wParam);
+
+ if (acc * delta < 0) {
+ // scroll direction reversed.
+ acc = 0;
+ }
+ acc += delta;
+ int direction = (acc >= 0) ? 1 : -1;
+ acc = abs(acc);
+
+ while (acc >= WHEEL_DELTA) {
+ system->pushEvent(new
GHOST_EventWheel(system->getMilliSeconds(), window, direction));
+ acc -= WHEEL_DELTA;
+ }
+ system->m_wheelDeltaAccum = acc * direction;
}
@@ -1137,14 +1145,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd,
UINT msg, WPARAM wParam,
POINT mouse_pos =
{GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
HWND mouse_hwnd =
ChildWindowFromPoint(HWND_DESKTOP, mouse_pos);
GHOST_WindowWin32 *mouse_window =
(GHOST_WindowWin32 *)::GetWindowLongPtr(mouse_hwnd, GWLP_USERDATA);
- if (mouse_window != NULL) {
- event =
processWheelEvent(mouse_window, wParam, lParam);
- }
- else {
- /* Happens when mouse is not
over any of blender's windows. */
- event =
processWheelEvent(window, wParam, lParam);
- }
-
+
+ processWheelEvent(mouse_window ?
mouse_window : window , wParam, lParam);
+ eventHandled = true;
#ifdef BROKEN_PEEK_TOUCHPAD
PostMessage(hwnd, WM_USER, 0, 0);
#endif
@@ -1203,6 +1206,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd,
UINT msg, WPARAM wParam,
GHOST_ModifierKeys modifiers;
modifiers.clear();
system->storeModifierKeys(modifiers);
+ system->m_wheelDeltaAccum = 0;
event =
processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate :
GHOST_kEventWindowDeactivate, window);
/* WARNING: Let DefWindowProc handle
WM_ACTIVATE, otherwise WM_MOUSEWHEEL
* will not be dispatched to OUR active
window if we minimize one of OUR wind
[Bf-blender-cvs] [bde5eb8] master: [Windows/MSVC] Blosc doesn't require debug libraries.
Commit: bde5eb8b6303d8d92b7c41d4a3f041bbb73c162d
Author: lazydodo
Date: Tue Sep 27 10:24:09 2016 -0600
Branches: master
https://developer.blender.org/rBbde5eb8b6303d8d92b7c41d4a3f041bbb73c162d
[Windows/MSVC] Blosc doesn't require debug libraries.
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 5efda52..961cada 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -414,7 +414,7 @@ if(WITH_OPENCOLORIO)
endif()
if(WITH_OPENVDB)
- set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug
${LIBDIR}/blosc/lib/libblosc_d.lib)
+ set(BLOSC_LIBRARIES ${LIBDIR}/blosc/lib/libblosc.lib )
set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug
${LIBDIR}/tbb/lib/tbb_debug.lib)
set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
set(OPENVDB ${LIBDIR}/openvdb)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9836940] blender-v2.78-release: Bring blender_release.cmake uptodate with the changes from D2227
Commit: 9836940d4d1208bbe1ff70b5d6aec2f00a153872 Author: lazydodo Date: Thu Sep 15 06:34:57 2016 -0600 Branches: blender-v2.78-release https://developer.blender.org/rB9836940d4d1208bbe1ff70b5d6aec2f00a153872 Bring blender_release.cmake uptodate with the changes from D2227 === M build_files/cmake/config/blender_release.cmake === diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 82ff315..8d87a92 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -12,6 +12,7 @@ set(WITH_CODEC_FFMPEGON CACHE BOOL "" FORCE) set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE) set(WITH_CYCLES ON CACHE BOOL "" FORCE) set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) +set(WITH_CYCLES_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [c6ab7c3] blender-v2.78-release: [windows] add some helpers to make.bat to facilitate making release builds.
Commit: c6ab7c31a14eb144ca84d6836c9d47b98a519dac Author: lazydodo Date: Wed Sep 14 17:50:16 2016 -0600 Branches: blender-v2.78-release https://developer.blender.org/rBc6ab7c31a14eb144ca84d6836c9d47b98a519dac [windows] add some helpers to make.bat to facilitate making release builds. New features: 1) Release target that checks for both cuda 7.5 and 8 with WITH_CYCLES_CUDA_BINARIES=ON and CYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 options set. 2) Option to switch between x86 and x64 builds, the default remains (auto detect the architecture) but can be overridden. 3) Option to switch between vs12(2013) and vs14(2015) default is 2013. Reviewers: juicyfruit, sergey Reviewed By: sergey Tags: #platform:_windows Differential Revision: https://developer.blender.org/D2180 === A build_files/cmake/config/blender_release.cmake M make.bat === diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake new file mode 100644 index 000..82ff315 --- /dev/null +++ b/build_files/cmake/config/blender_release.cmake @@ -0,0 +1,78 @@ +# Turn everything ON thats expected for an official release builds. +# +# Example usage: +# cmake -C../blender/build_files/cmake/config/blender_full.cmake ../blender +# + +set(WITH_ALEMBIC ON CACHE BOOL "" FORCE) +set(WITH_BUILDINFO ON CACHE BOOL "" FORCE) +set(WITH_BULLET ON CACHE BOOL "" FORCE) +set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE) +set(WITH_CODEC_FFMPEGON CACHE BOOL "" FORCE) +set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE) +set(WITH_CYCLES ON CACHE BOOL "" FORCE) +set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) +set(WITH_FFTW3 ON CACHE BOOL "" FORCE) +set(WITH_LIBMV ON CACHE BOOL "" FORCE) +set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) +set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) +set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) +set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) +set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) +set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) +set(WITH_IK_ITASCON CACHE BOOL "" FORCE) +set(WITH_IMAGE_CINEONON CACHE BOOL "" FORCE) +set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE) +set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE) +set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) +set(WITH_JACKON CACHE BOOL "" FORCE) +set(WITH_LZMAON CACHE BOOL "" FORCE) +set(WITH_LZO ON CACHE BOOL "" FORCE) +set(WITH_MOD_BOOLEAN ON CACHE BOOL "" FORCE) +set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) +set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) +set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE) +set(WITH_MOD_OCEANSIMON CACHE BOOL "" FORCE) +set(WITH_AUDASPACE ON CACHE BOOL "" FORCE) +set(WITH_OPENAL ON CACHE BOOL "" FORCE) +set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) +set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) +set(WITH_OPENMP ON CACHE BOOL "" FORCE) +set(WITH_OPENVDB ON CACHE BOOL "" FORCE) +set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) +set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) +set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE) +set(WITH_SDL ON CACHE BOOL "" FORCE) +set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) +set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) + +set(WITH_PLAYER ON CACHE BOOL "" FORCE) +set(WITH_MEM_JEMALLOCON CACHE BOOL "" FORCE) +set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) +set(CYCLES_CUDA_BINARIES_ARCH sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE) + +# platform dependent options +if(UNIX AND NOT APPLE) + set(WITH_JACKON CACHE BOOL "" FORCE) + set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) + set(WITH_OPENSUBDIV
[Bf-blender-cvs] [40247ee] master: [Windows/make.bat] Clean only after all parameters have been processed so the full path is known, and require a convenience target to be set. Also added a helpful er
Commit: 40247ee491fbe7517a4de3920c3616c9329cde6d Author: lazydodo Date: Sat Sep 17 09:19:54 2016 -0600 Branches: master https://developer.blender.org/rB40247ee491fbe7517a4de3920c3616c9329cde6d [Windows/make.bat] Clean only after all parameters have been processed so the full path is known, and require a convenience target to be set. Also added a helpful error message if any of the required data is not available. === M make.bat === diff --git a/make.bat b/make.bat index 99c1e7f..4f911c3 100644 --- a/make.bat +++ b/make.bat @@ -13,30 +13,7 @@ if NOT "%1" == "" ( REM Help Message if "%1" == "help" ( - echo. - echo Convenience targets - echo - release - echo - debug - echo - full - echo - lite - echo - headless - echo - cycles - echo - bpy - echo. - echo Utilities ^(not associated with building^) - echo - clean - echo - update - echo - nobuild ^(only generate project files^) - echo - showhash ^(Show git hashes of source tree^) - echo. - echo Configuration options - echo - packagename [newname] ^(override default cpack package name^) - echo - x86 ^(override host autodetect and build 32 bit code^) - echo - x64 ^(override host autodetect and build 64 bit code^) - echo - 2013 ^(build with visual studio 2013^) - echo - 2015 ^(build with visual studio 2015^) [EXPERIMENTAL] - echo. - goto EOF + goto HELP ) REM Build Types @@ -46,26 +23,32 @@ if NOT "%1" == "" ( REM Build Configurations ) else if "%1" == "full" ( + set TARGET_SET=1 set BUILD_DIR=%BUILD_DIR%_full set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_full.cmake" ) else if "%1" == "lite" ( + set TARGET_SET=1 set BUILD_DIR=%BUILD_DIR%_lite set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_lite.cmake" ) else if "%1" == "cycles" ( + set TARGET_SET=1 set BUILD_DIR=%BUILD_DIR%_cycles set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\cycles_standalone.cmake" ) else if "%1" == "headless" ( + set TARGET_SET=1 set BUILD_DIR=%BUILD_DIR%_headless set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\blender_headless.cmake" ) else if "%1" == "bpy" ( + set TARGET_SET=1 set BUILD_DIR=%BUILD_DIR%_bpy set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^ -C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake" ) else if "%1" == "release" ( + set TARGET_SET=1 if "%CUDA_PATH_V7_5%"=="" ( echo Cuda 7.5 Not found, aborting! goto EOF @@ -110,15 +93,7 @@ if NOT "%1" == "" ( git submodule foreach git pull --rebase origin master goto EOF ) else if "%1" == "clean" ( - msbuild ^ - %BUILD_DIR%\Blender.sln ^ - /target:clean ^ - /property:Configuration=%BUILD_TYPE% ^ - /verbosity:minimal - if %ERRORLEVEL% NEQ 0 ( - echo Cleaned "%BUILD_DIR%" - ) - goto EOF + set MUST_CLEAN=1 ) else ( echo Command "%1" unknown, aborting! goto EOF @@ -181,12 +156,29 @@ if NOT EXIST %BLENDER_DIR%..\lib\nul ( echo This is needed for building, aborting! goto EOF ) +if NOT "%TARGET_SET%"=="1" ( + echo Error: Convenience target not set + echo This is required for building, aborting! + echo . + goto HELP +) set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER% %BUILD_VS_YEAR%%WINDOWS_ARCH%" if NOT EXIST %BUILD_DIR%\nul ( mkdir %BUILD_DIR% ) - +if "%MUST_CLEAN%"=="1" ( + echo Cleaning %BUILD_
[Bf-blender-cvs] [42c17cb] master: Bring blender_release.cmake uptodate with the changes from D2227
Commit: 42c17cb7695422fc58ec20676b5199eeb9705bf1 Author: lazydodo Date: Thu Sep 15 06:34:57 2016 -0600 Branches: master https://developer.blender.org/rB42c17cb7695422fc58ec20676b5199eeb9705bf1 Bring blender_release.cmake uptodate with the changes from D2227 === M build_files/cmake/config/blender_release.cmake === diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 82ff315..8d87a92 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -12,6 +12,7 @@ set(WITH_CODEC_FFMPEGON CACHE BOOL "" FORCE) set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE) set(WITH_CYCLES ON CACHE BOOL "" FORCE) set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) +set(WITH_CYCLES_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f339d5a] master: [windows] add some helpers to make.bat to facilitate making release builds.
Commit: f339d5a8ce145b6a12ec8c8de7ed820b8f481978 Author: lazydodo Date: Wed Sep 14 17:50:16 2016 -0600 Branches: master https://developer.blender.org/rBf339d5a8ce145b6a12ec8c8de7ed820b8f481978 [windows] add some helpers to make.bat to facilitate making release builds. New features: 1) Release target that checks for both cuda 7.5 and 8 with WITH_CYCLES_CUDA_BINARIES=ON and CYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 options set. 2) Option to switch between x86 and x64 builds, the default remains (auto detect the architecture) but can be overridden. 3) Option to switch between vs12(2013) and vs14(2015) default is 2013. Reviewers: juicyfruit, sergey Reviewed By: sergey Tags: #platform:_windows Differential Revision: https://developer.blender.org/D2180 === A build_files/cmake/config/blender_release.cmake M make.bat === diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake new file mode 100644 index 000..82ff315 --- /dev/null +++ b/build_files/cmake/config/blender_release.cmake @@ -0,0 +1,78 @@ +# Turn everything ON thats expected for an official release builds. +# +# Example usage: +# cmake -C../blender/build_files/cmake/config/blender_full.cmake ../blender +# + +set(WITH_ALEMBIC ON CACHE BOOL "" FORCE) +set(WITH_BUILDINFO ON CACHE BOOL "" FORCE) +set(WITH_BULLET ON CACHE BOOL "" FORCE) +set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE) +set(WITH_CODEC_FFMPEGON CACHE BOOL "" FORCE) +set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE) +set(WITH_CYCLES ON CACHE BOOL "" FORCE) +set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) +set(WITH_FFTW3 ON CACHE BOOL "" FORCE) +set(WITH_LIBMV ON CACHE BOOL "" FORCE) +set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) +set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) +set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) +set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) +set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) +set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) +set(WITH_IK_ITASCON CACHE BOOL "" FORCE) +set(WITH_IMAGE_CINEONON CACHE BOOL "" FORCE) +set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE) +set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE) +set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE) +set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) +set(WITH_JACKON CACHE BOOL "" FORCE) +set(WITH_LZMAON CACHE BOOL "" FORCE) +set(WITH_LZO ON CACHE BOOL "" FORCE) +set(WITH_MOD_BOOLEAN ON CACHE BOOL "" FORCE) +set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) +set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) +set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE) +set(WITH_MOD_OCEANSIMON CACHE BOOL "" FORCE) +set(WITH_AUDASPACE ON CACHE BOOL "" FORCE) +set(WITH_OPENAL ON CACHE BOOL "" FORCE) +set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) +set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) +set(WITH_OPENMP ON CACHE BOOL "" FORCE) +set(WITH_OPENVDB ON CACHE BOOL "" FORCE) +set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) +set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) +set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE) +set(WITH_SDL ON CACHE BOOL "" FORCE) +set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) +set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) + +set(WITH_PLAYER ON CACHE BOOL "" FORCE) +set(WITH_MEM_JEMALLOCON CACHE BOOL "" FORCE) +set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) +set(CYCLES_CUDA_BINARIES_ARCH sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE) + +# platform dependent options +if(UNIX AND NOT APPLE) + set(WITH_JACKON CACHE BOOL "" FORCE) + set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) + set(WITH_OPENSUBDIV ON
[Bf-blender-cvs] [b67db67] blender-v2.78-release: [CMAKE/Platform/Windows] Only perform version check if the actual compiler is MSVC
Commit: b67db67b012d688b3f0b4b1d12c45e33ea2ccaab
Author: lazydodo
Date: Sat Sep 10 17:58:56 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rBb67db67b012d688b3f0b4b1d12c45e33ea2ccaab
[CMAKE/Platform/Windows] Only perform version check if the actual compiler is
MSVC
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 2772944..4ba6f44 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -39,20 +39,22 @@ endmacro()
add_definitions(-DWIN32)
# Minimum MSVC Version
-if(MSVC_VERSION EQUAL 1800)
- set(_min_ver "18.0.31101")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2013 (Update 4, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ if(MSVC_VERSION EQUAL 1800)
+ set(_min_ver "18.0.31101")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2013 (Update 4, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
-endif()
-if(MSVC_VERSION EQUAL 1900)
- set(_min_ver "19.0.24210")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2015 (Update 3, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+ if(MSVC_VERSION EQUAL 1900)
+ set(_min_ver "19.0.24210")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2015 (Update 3, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
endif()
unset(_min_ver)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [fcb7973] blender-v2.78-release: [cmake/cpack] allow override of package name
Commit: fcb797384973b1d7bb7260dff2ccea1c34fb9787
Author: lazydodo
Date: Tue Sep 6 07:21:23 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rBfcb797384973b1d7bb7260dff2ccea1c34fb9787
[cmake/cpack] allow override of package name
Cpack generates a standard filename with git information in it, which might not
always be wanted for release builds, this patch adds an option to override that
default filename.
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D2199
===
M CMakeLists.txt
M build_files/cmake/packaging.cmake
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 709f824..5f7d59a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,6 +220,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
endif()
set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date
for reproducable builds (empty string disables this option)")
set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time
for reproducable builds (empty string disables this option)")
+set(PACKAGENAME_OVERRIDE "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
+mark_as_advanced(PACKAGENAME_OVERRIDE)
mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index bc1d64f..1563331 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -48,7 +48,11 @@ else(MSVC)
set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
endif()
-set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
+if (CPACK_OVERRIDE_PACKAGENAME)
+ set(CPACK_PACKAGE_FILE_NAME
${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
+else()
+ set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
+endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [abe4c38] blender-v2.78-release: [cmake/cpack] allow override of package name
Commit: abe4c384100fad370a0add55b5225d1dabcf85a1
Author: lazydodo
Date: Tue Sep 6 07:21:23 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rBabe4c384100fad370a0add55b5225d1dabcf85a1
[cmake/cpack] allow override of package name
Cpack generates a standard filename with git information in it, which might not
always be wanted for release builds, this patch adds an option to override that
default filename.
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D2199
ammended to fix: wrong variable name in main CMakeLists.txt
===
M CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f7d59a..352712e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,8 +220,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
endif()
set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date
for reproducable builds (empty string disables this option)")
set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time
for reproducable builds (empty string disables this option)")
-set(PACKAGENAME_OVERRIDE "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
-mark_as_advanced(PACKAGENAME_OVERRIDE)
+set(CPACK_OVERRIDE_PACKAGENAME "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
+mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME)
mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [96f28f9] master: [CMAKE/Platform/Windows] Only perform version check if the actual compiler is MSVC
Commit: 96f28f9b5060f823631ced28e325e5d6b11c25b4
Author: lazydodo
Date: Sat Sep 10 17:58:56 2016 -0600
Branches: master
https://developer.blender.org/rB96f28f9b5060f823631ced28e325e5d6b11c25b4
[CMAKE/Platform/Windows] Only perform version check if the actual compiler is
MSVC
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 2772944..4ba6f44 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -39,20 +39,22 @@ endmacro()
add_definitions(-DWIN32)
# Minimum MSVC Version
-if(MSVC_VERSION EQUAL 1800)
- set(_min_ver "18.0.31101")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2013 (Update 4, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ if(MSVC_VERSION EQUAL 1800)
+ set(_min_ver "18.0.31101")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2013 (Update 4, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
-endif()
-if(MSVC_VERSION EQUAL 1900)
- set(_min_ver "19.0.24210")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2015 (Update 3, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+ if(MSVC_VERSION EQUAL 1900)
+ set(_min_ver "19.0.24210")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2015 (Update 3, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
endif()
unset(_min_ver)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [049ed1f] master: [cmake/cpack] allow override of package name
Commit: 049ed1f4e7b0b50ab0f47bb698e9ad632ca5542f
Author: lazydodo
Date: Tue Sep 6 07:21:23 2016 -0600
Branches: master
https://developer.blender.org/rB049ed1f4e7b0b50ab0f47bb698e9ad632ca5542f
[cmake/cpack] allow override of package name
Cpack generates a standard filename with git information in it, which might not
always be wanted for release builds, this patch adds an option to override that
default filename.
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D2199
ammended to fix: wrong variable name in main CMakeLists.txt
===
M CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f7d59a..352712e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,8 +220,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
endif()
set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date
for reproducable builds (empty string disables this option)")
set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time
for reproducable builds (empty string disables this option)")
-set(PACKAGENAME_OVERRIDE "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
-mark_as_advanced(PACKAGENAME_OVERRIDE)
+set(CPACK_OVERRIDE_PACKAGENAME "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
+mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME)
mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [abd54f1] master: [cmake/cpack] allow override of package name
Commit: abd54f1ed2a5706a394e31ef00f89dee19d55e87
Author: lazydodo
Date: Tue Sep 6 07:21:23 2016 -0600
Branches: master
https://developer.blender.org/rBabd54f1ed2a5706a394e31ef00f89dee19d55e87
[cmake/cpack] allow override of package name
Cpack generates a standard filename with git information in it, which might not
always be wanted for release builds, this patch adds an option to override that
default filename.
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Differential Revision: https://developer.blender.org/D2199
===
M CMakeLists.txt
M build_files/cmake/packaging.cmake
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 709f824..5f7d59a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,6 +220,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
endif()
set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date
for reproducable builds (empty string disables this option)")
set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time
for reproducable builds (empty string disables this option)")
+set(PACKAGENAME_OVERRIDE "" CACHE STRING "Use instead of the standard
packagename (empty string disables this option)")
+mark_as_advanced(PACKAGENAME_OVERRIDE)
mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index bc1d64f..1563331 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -48,7 +48,11 @@ else(MSVC)
set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
endif()
-set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
+if (CPACK_OVERRIDE_PACKAGENAME)
+ set(CPACK_PACKAGE_FILE_NAME
${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
+else()
+ set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
+endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [f0159d1] master: Fix T49215
Commit: f0159d1d48a141483f61b1ccc262f99016b63570
Author: lazydodo
Date: Thu Sep 1 14:00:20 2016 -0600
Branches: master
https://developer.blender.org/rBf0159d1d48a141483f61b1ccc262f99016b63570
Fix T49215
===
M intern/ghost/intern/GHOST_ContextWGL.cpp
===
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp
b/intern/ghost/intern/GHOST_ContextWGL.cpp
index abce3ea..64ee692 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -183,6 +183,7 @@ static int weight_pixel_format(PIXELFORMATDESCRIPTOR ,
PIXELFORMATDESCRIPTOR
!(pfd.dwFlags & PFD_DOUBLEBUFFER)|| /* Blender _needs_ this */
!(pfd.iPixelType == PFD_TYPE_RGBA) ||
(pfd.cDepthBits < 16) ||
+(pfd.cColorBits > 32) || /* 64 bit formats disable
aero */
(pfd.dwFlags & PFD_GENERIC_FORMAT))/* no software renderers */
{
return 0;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [8fb9f2d] master: [Windows] Add support for code signing the final binaries.
Commit: 8fb9f2dbe9cb69476bf1f98c8503e5acd446c5b0
Author: lazydodo
Date: Wed Aug 31 06:26:05 2016 -0600
Branches: master
https://developer.blender.org/rB8fb9f2dbe9cb69476bf1f98c8503e5acd446c5b0
[Windows] Add support for code signing the final binaries.
The option is controlled with the WITH_WINDOWS_CODESIGN option and needs:
- Signtool must be found on the system, the standard windows sdk folders will
be searched for it.
- The path to the pfx file (WINDOWS_CODESIGN_PFX)
- The password for the pfx , this can either be set by the
WINDOWS_CODESIGN_PFX_PASSWORD variable but given that ends up in CMakeCache.txt
(which might be undesirable) there is a backup option of setting the
PFXPASSWORD environment variable on the system.
Reviewers: sergey, juicyfruit
Reviewed By: juicyfruit
Tags: #bf_blender, #platform:_windows
Differential Revision: https://developer.blender.org/D2182
===
M CMakeLists.txt
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_win32_msvc.cmake
M source/blenderplayer/CMakeLists.txt
M source/creator/CMakeLists.txt
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7276f4..709f824 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,6 +512,15 @@ mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
+option(WITH_WINDOWS_CODESIGN "Use signtool to sign the final binary." OFF)
+mark_as_advanced(WITH_WINDOWS_CODESIGN)
+
+set(WINDOWS_CODESIGN_PFX CACHE FILEPATH "Path to pfx file to use for
codesigning.")
+mark_as_advanced(WINDOWS_CODESIGN_PFX)
+
+set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING "password for pfx file used
for codesigning.")
+mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD)
+
# avoid using again
option_defaults_clear()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index dc8b158..fabb35c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1578,3 +1578,26 @@ macro(openmp_delayload
endif(WITH_OPENMP)
endif(MSVC)
endmacro()
+
+MACRO(WINDOWS_SIGN_TARGET target)
+ if (WITH_WINDOWS_CODESIGN)
+ if (!SIGNTOOL_EXE)
+ error("Codesigning is enabled, but signtool is not
found")
+ else()
+ if (WINDOWS_CODESIGN_PFX_PASSWORD)
+ set(CODESIGNPASSWORD /p
${WINDOWS_CODESIGN_PFX_PASSWORD})
+ else()
+ if ($ENV{PFXPASSWORD})
+ set(CODESIGNPASSWORD /p
$ENV{PFXPASSWORD})
+ else()
+ message( FATAL_ERROR
"WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and
environment variable PFXPASSWORD not found, unable to sign code.")
+ endif()
+ endif()
+ add_custom_command(TARGET ${target}
+ POST_BUILD
+ COMMAND ${SIGNTOOL_EXE} sign /f
${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
+ VERBATIM
+ )
+ endif()
+ endif()
+ENDMACRO()
\ No newline at end of file
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index eaa6e41..2772944 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -471,3 +471,15 @@ endif()
# used in many places so include globally, like OpenGL
blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
+
+#find signtool
+SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
+find_program(SIGNTOOL_EXE signtool
+HINTS
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
+ "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
+ "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
+)
diff --git a/source/blenderplayer/CMakeLists.txt
b/source/blenderplayer/CMakeLists.txt
index 2748de0..58bebc6 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -58,7 +58,7 @@ if(WIN32 AND NOT UNIX)
blenderplayer ${EXETYPE}
bad_level_call_stubs/stubs.c
[Bf-blender-cvs] [5c04b4f] master: Fix T49196
Commit: 5c04b4fdfb0c914889ddcf2202712e39e08d8946 Author: lazydodo Date: Mon Aug 29 13:33:01 2016 -0600 Branches: master https://developer.blender.org/rB5c04b4fdfb0c914889ddcf2202712e39e08d8946 Fix T49196 === M source/gameengine/GamePlayer/ghost/CMakeLists.txt === diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 6c09af3..577e25d 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -81,6 +81,10 @@ if(WIN32) blender_include_dirs(../../../../intern/utfconv) endif() +if(WITH_INPUT_NDOF) + add_definitions(-DWITH_INPUT_NDOF) +endif(WITH_INPUT_NDOF) + if(WITH_CODEC_FFMPEG) add_definitions(-DWITH_FFMPEG) endif() ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [bfc5a94] master: Windows Packaging : Make package-name confirm to the windows[32/64] naming scheme we use.
Commit: bfc5a94292bb6044e6f95d56d896ad2231e685e7
Author: lazydodo
Date: Wed Aug 24 09:37:42 2016 -0600
Branches: master
https://developer.blender.org/rBbfc5a94292bb6044e6f95d56d896ad2231e685e7
Windows Packaging : Make package-name confirm to the windows[32/64] naming
scheme we use.
===
M build_files/cmake/packaging.cmake
===
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index 72f10bb..bc1d64f 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -40,9 +40,9 @@ execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE
CPACK_DATE OUTPUT_STRIP_T
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
if (MSVC)
if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(PACKAGE_ARCH Win64)
+ set(PACKAGE_ARCH windows64)
else()
- set(PACKAGE_ARCH Win32)
+ set(PACKAGE_ARCH windows32)
endif()
else(MSVC)
set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [7dc328e] master: D2078 Windows : add option to prevent find_package from picking up the wrong libraries and use hardcoded paths instead.
Commit: 7dc328e8a1cea0f1ea0b8848a38ce7521401ca8b
Author: lazydodo
Date: Tue Aug 23 08:47:23 2016 -0600
Branches: master
https://developer.blender.org/rB7dc328e8a1cea0f1ea0b8848a38ce7521401ca8b
D2078 Windows : add option to prevent find_package from picking up the wrong
libraries and use hardcoded paths instead.
===
M CMakeLists.txt
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 170537b..d7276f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,6 +508,10 @@ mark_as_advanced(WITH_CXX11)
option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
+# Use hardcoded paths or find_package to find externals
+option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
+mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
+
# avoid using again
option_defaults_clear()
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 696a371..eaa6e41 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -23,6 +23,20 @@
# Libraries configuration for Windows when compiling with MSVC.
+macro(warn_hardcoded_paths package_name
+ )
+ if(WITH_WINDOWS_FIND_MODULES)
+ message(WARNING "Using HARDCODED ${package_name} locations")
+ endif(WITH_WINDOWS_FIND_MODULES)
+endmacro()
+
+macro(windows_find_package package_name
+ )
+ if(WITH_WINDOWS_FIND_MODULES)
+ find_package( ${package_name})
+ endif(WITH_WINDOWS_FIND_MODULES)
+endmacro()
+
add_definitions(-DWIN32)
# Minimum MSVC Version
if(MSVC_VERSION EQUAL 1800)
@@ -141,12 +155,12 @@ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
set(ZLIB_DIR ${LIBDIR}/zlib)
-#find_package(zlib) # we want to find before finding things that depend on it
like png
+windows_find_package(zlib) # we want to find before finding things that depend
on it like png
+windows_find_package(png)
-find_package(png)
if(NOT PNG_FOUND)
- message(WARNING "Using HARDCODED libpng locations")
+ warn_hardcoded_paths(libpng)
set(PNG_PNG_INCLUDE_DIR ${LIBDIR}/png/include)
set(PNG_LIBRARIES libpng)
set(PNG "${LIBDIR}/png")
@@ -155,7 +169,12 @@ if(NOT PNG_FOUND)
endif()
set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
-find_package(jpeg REQUIRED)
+windows_find_package(jpeg REQUIRED)
+if(NOT JPEG_FOUND)
+ warn_hardcoded_paths(jpeg)
+ set(JPEG_INCLUDE_DIR ${LIBDIR}/jpeg/include)
+ set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib)
+endif()
set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
@@ -166,7 +185,7 @@ set(FREETYPE_INCLUDE_DIRS
${LIBDIR}/freetype/include/freetype2
)
set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
-find_package(freetype REQUIRED)
+windows_find_package(freetype REQUIRED)
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
@@ -212,9 +231,9 @@ if(WITH_CODEC_FFMPEG)
${LIBDIR}/ffmpeg/include
${LIBDIR}/ffmpeg/include/msvc
)
- find_package(FFMPEG)
+ windows_find_package(FFMPEG)
if(NOT FFMPEG_FOUND)
- message(WARNING "Using HARDCODED ffmpeg locations")
+ warn_hardcoded_paths(ffmpeg)
set(FFMPEG_LIBRARY_VERSION 55)
set(FFMPEG_LIBRARY_VERSION_AVU 52)
set(FFMPEG_LIBRARIES
@@ -230,9 +249,9 @@ endif()
if(WITH_IMAGE_OPENEXR)
set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
set(OPENEXR_VERSION "2.1")
- find_package(OPENEXR REQUIRED)
+ windows_find_package(OPENEXR REQUIRED)
if(NOT OPENEXR_FOUND)
- message(WARNING "Using HARDCODED OpenEXR locations")
+ warn_hardcoded_paths(OpenEXR)
set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}
${OPENEXR}/include/OpenEXR)
@@ -254,9 +273,9 @@ endif()
if(WITH_IMAGE_TIFF)
# Try to find tiff first then complain and set static and maybe wrong
paths
- find_package(TIFF)
+ windows_find_package(TIFF)
if(NOT TIFF_FOUND)
- message(WARNING "Using HARDCODED libtiff locations")
+ warn_hardcoded_paths(libtiff)
set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
endif()
@@ -299,9 +318,11 @@ if(WITH_BOOST)
set(Boos
[Bf-blender-cvs] [0dec3d6] master: Build Packaging : Set proper package name on Windows.
Commit: 0dec3d6e220902bd769bc7acec2bbc5320ff900c
Author: lazydodo
Date: Mon Aug 22 08:15:03 2016 -0600
Branches: master
https://developer.blender.org/rB0dec3d6e220902bd769bc7acec2bbc5320ff900c
Build Packaging : Set proper package name on Windows.
===
M build_files/cmake/packaging.cmake
===
diff --git a/build_files/cmake/packaging.cmake
b/build_files/cmake/packaging.cmake
index afdbc64..72f10bb 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -38,7 +38,17 @@ unset(MY_WC_HASH)
# Force Package Name
execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+if (MSVC)
+ if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(PACKAGE_ARCH Win64)
+ else()
+ set(PACKAGE_ARCH Win32)
+ endif()
+else(MSVC)
+ set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
+set(CPACK_PACKAGE_FILE_NAME
${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
