Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-07Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-07macOS: remove old OpenMP lib stuff from cmakeArto Kitula
2017-11-05Merge branch 'master' into blender2.8Campbell Barton
2017-11-05Cleanup: indentation, line wrappingCampbell Barton
2017-11-04Fix broken macOS build with libsndfile, name is different than in master.Brecht Van Lommel
2017-10-30CMake: cleanupCampbell Barton
2017-10-30CMake: cleanupCampbell Barton
2017-10-29Merge branch 'master' into blender2.8Germano
# Conflicts: # build_files/cmake/macros.cmake # build_files/cmake/platform/platform_win32.cmake
2017-10-29CMake: use only absolute linker paths for msvc.Ray Molenkamp
cmake's link_directories will supply forward slashes for the search paths, the msvc linker has some issues with that, while it will search for the needed libs just fine, the incremental linker gets fed forward slashes for some libs, while the previous binary has backward slashes in it's metadata, the linker assumes obj files got added and performs a full link instead of an incremental link. This change brings down the link time with newer msvc versions for a trivial edit down from a few minutes to a few seconds.
2017-10-25Merge branch 'master' into blender2.8Sergey Sharybin
2017-10-24Fix Cycles gtests build on macOS.Brecht Van Lommel
2017-10-06Merge branch 'master' into blender28Campbell Barton
2017-10-04installdeps: Fix building numpy with newer py system...Bastien Montagne
Many thanks to Jens Verwiebe for investigating and finding this fix.
2017-10-04Merge branch 'master' into blender2.8Sergey Sharybin
2017-10-03CMake: avoid naming collisionCampbell Barton
2017-10-03Python: bump minimum version to 3.6Campbell Barton
2017-10-03Merge branch 'master' into blender2.8Sergey Sharybin
Notes: - Changes in paint_vertex.c were simple to merge, mainly related on passing evaluation context. - Conflicts in EditDM and drawmesh.c are solved using code from blender2.8 branch. Those areas are deprecated and not to be used in final release. However, it's possible that some reference code from master is lost, so keep attention when adding alpha support for vertex painting.
2017-10-02Buildbot: Re-enable cuda binaries, those should workSergey Sharybin
2017-10-01Buildbot: Use latest master config from buildbotSergey Sharybin
2017-10-01Buildbot: Extra tweaks to packing rulesSergey Sharybin
2017-10-01Buildbot: Tweaks to current macOS configSergey Sharybin
Also disable CUDA binaries for now, those would need some extra work.
2017-09-29Merge branch 'master' into blender2.8Campbell Barton
2017-09-29Drop platform support for Solaris & AIXCampbell Barton
These platforms didn't see maintenance in years. This commit just removes ifdef's & cmake check.
2017-09-29Code cleanup: remove unnecessary buildbot code after macOS library upgrade.Brecht Van Lommel
2017-09-28macOS: officially upgrade to 10.9 libraries from lib/darwin.Brecht Van Lommel
This removes a bunch of code that is no longer needed, and running "make update" will now automatically download the new libraries. Differential Revision: https://developer.blender.org/D2861
2017-09-28Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-28CMake: move MSVC warnings to central locationCampbell Barton
2017-09-27[build_deps.cmd] Turn down logging verbosity to normal.Ray Molenkamp
2017-09-27[msvc] treat C4133 as error instead of a warning to mimic gcc's ↵Ray Molenkamp
-Werror=incompatible-pointer-types as requested by @campbellbarton and @mano-wii
2017-09-26Merge branch 'master' into blender2.8Campbell Barton
2017-09-26deps libs: fix xiph library support on sndfile on macOSArto Kitula
2017-09-25Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-22Remove quicktime supportAaron Carlisle
It has been deprecated since at least macOS 10.9 and fully removed in 10.12. I am unsure if we should remove it only in 2.8. But you cannot build blender with it supported when using a modern xcode version anyway so I would tend towards just removing it also for 2.79 if that ever happens. Reviewers: mont29, dfelinto, juicyfruit, brecht Reviewed By: mont29, brecht Subscribers: Blendify, brecht Maniphest Tasks: T52807 Differential Revision: https://developer.blender.org/D2333
2017-09-22[cmake/deps_builder] update openjpeg to 1.5.2 to match the version in ↵Ray Molenkamp
master/extern , add support for openjpeg in oiio. Mark webp as an optional component.
2017-09-22Fix T52875: install_deps.sh - numpy-1.13.1.tar.gz - 404 Not Found.Bastien Montagne
2017-09-22Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-21build deps: add support for multiple xcode installsArto Kitula
2017-09-21[cmake_deps/msvc] Move llvm/clang harvest to their individual cmake files.Ray Molenkamp
2017-09-21deps build: add openjpeg to OIIOArto Kitula
2017-09-21[cmake_deps/msvc] Move boost harvest to boost.cmakeRay Molenkamp
2017-09-21[cmake/builddeps] update for site-packages on windows to support the new ↵Ray Molenkamp
requests version.
2017-09-21Install_deps: Raise python and numpy versions (to 3.6.2 and 1.13.1 ↵Bastien Montagne
respectively).
2017-09-21deps build: use pip to install requests 2.18.4 and it's depsArto Kitula
2017-09-20[cmake/msvc] Update python to 3.6 + numpy to 1.13.1Ray Molenkamp
2017-09-20[cmake/depsbuilder/msvc] Update to python 3.6 / numpy 1.13.1Ray Molenkamp
-No more hardcoded python35/36 tokens in the scripts -disabled python module for boost, was not used -Updated patches for python to support building with msvc2013
2017-09-20deps build: correct sndfile fixArto Kitula
2017-09-20Merge branch 'master' into blender2.8Campbell Barton
2017-09-20deps build: fix sndfile building on macOSArto Kitula
2017-09-20macOS: use python version 3.6 when building blenderArto Kitula
2017-09-20deps build: bump Python to 3.6.2 and Numpy to 1.13.1Arto Kitula