griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
73,197 Commits 1 Branch 0 Tags
fb4cd136a7cf94f2fda2d3a2c8fb01d73eb878cb
Commit Graph

1707 Commits

Author SHA1 Message Date
Bastien Montagne
5a6a819b5d Merge branch 'master' into blender2.8 2018-01-04 10:36:50 +01:00
Arto Kitula
25418be97e build deps: llvm new website download locations 2018-01-03 14:52:25 +02:00
Campbell Barton
be40389165 Merge branch 'master' into blender2.8 2018-01-03 23:44:47 +11:00
Bastien Montagne
e84966ac42 nstall_deps: llvm downloads new website location 
Patch by Lucas Walter (@lucasw), thanks.

Reviewers: mont29

Reviewed By: mont29

Subscribers: mont29

Differential Revision: https://developer.blender.org/D2983
 2018-01-02 15:23:45 +01:00
Brecht Van Lommel
ac934efc5e Build: fix make deps TBB on Linux, older versions don't support GCC 7. 2017-12-30 00:07:33 +01:00
Brecht Van Lommel
6a225a283e Build: fix make deps OpenSubdiv build on Linux. 2017-12-29 22:53:32 +01:00
Campbell Barton
4737b95b65 Merge branch 'master' into blender2.8 2017-12-11 19:24:37 +11:00
Campbell Barton
c568985118 MSVC: Fix compiling with some system languages 
Report from @cyaoeu that compiling failed for Japanese system language.
 2017-12-10 15:19:50 +11:00
Campbell Barton
1c0905be0f Merge branch 'master' into blender2.8 2017-12-08 00:21:54 +11:00
Campbell Barton
efdd8f12a0 CMake: GREATER_EQUAL is from v3.7, use GREATER 2017-12-08 00:20:48 +11:00
Campbell Barton
7ca8af4cc8 Merge branch 'master' into blender2.8 2017-12-06 16:51:37 +11:00
Campbell Barton
2480a190de CMake: remove git found message 2017-12-06 16:37:50 +11:00
Antonio Vazquez
272973804e Merge branch 'master' into blender2.8 2017-12-05 19:04:34 +01:00
Campbell Barton
a580565086 CMake: avoid checking each MSVC minor revision 2017-12-06 03:38:44 +11:00
Antonioya
a65695759c Fix MSVS2017 compiler version 
After last update to Visual Studio 2017 15.5.0 the compiler version changed
 2017-12-05 17:16:02 +01:00
Campbell Barton
03a5eccc94 Merge branch 'master' into blender2.8 2017-11-30 18:30:41 +11:00
Campbell Barton
28d2148b09 Haiku OS Support 
D2860 by @miqlas

Even though Haiku is a niche OS, only minor changes are needed.
 2017-11-30 18:05:21 +11:00
Julian Eisel
7f96323cd0 Merge branch 'master' into blender2.8 2017-11-19 13:16:14 +01:00
Campbell Barton
abd5841441 CMake: remove solaris path 2017-11-19 03:46:50 +11:00
Dalai Felinto
1cb6cea71c Merge remote-tracking branch 'origin/master' into blender2.8 2017-11-13 11:48:48 -02:00
Sergey Sharybin
42dff6cc2e Cycles: Fix compilation error with OIIO compiled against system PugiXML 2017-11-13 10:42:29 +01:00
Brecht Van Lommel
2440415bd3 Merge branch 'master' into blender2.8 2017-11-07 03:08:24 +01:00
Arto Kitula
956ee5e265 macOS: remove old OpenMP lib stuff from cmake 2017-11-06 23:54:35 +02:00
Campbell Barton
58dc114615 Merge branch 'master' into blender2.8 2017-11-06 00:12:28 +11:00
Campbell Barton
914e3b1645 Cleanup: indentation, line wrapping 2017-11-05 14:50:15 +11:00
Brecht Van Lommel
d2ea1b2dcd Fix broken macOS build with libsndfile, name is different than in master. 2017-11-04 17:50:09 +01:00
Campbell Barton
619600a53f CMake: cleanup 2017-10-30 18:48:27 +11:00
Campbell Barton
e8daf2e3ea CMake: cleanup 2017-10-30 12:59:36 +11:00
Germano
bed3cbdf3d Merge branch 'master' into blender2.8 
# Conflicts:
#	build_files/cmake/macros.cmake
#	build_files/cmake/platform/platform_win32.cmake
 2017-10-29 18:20:24 -02:00
Ray Molenkamp
475ec5269a CMake: use only absolute linker paths for msvc. 
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-29 13:16:22 -06:00
Sergey Sharybin
1e107fa514 Merge branch 'master' into blender2.8 2017-10-25 10:13:35 +02:00
Brecht Van Lommel
fe253389e0 Fix Cycles gtests build on macOS. 2017-10-24 17:52:20 +02:00
Campbell Barton
ea606a7847 Merge branch 'master' into blender28 2017-10-06 21:25:33 +11:00
Bastien Montagne
754f5d39c5 installdeps: Fix building numpy with newer py system... 
Many thanks to Jens Verwiebe for investigating and finding this fix.
 2017-10-04 20:16:39 +02:00
Sergey Sharybin
63c472b4f9 Merge branch 'master' into blender2.8 2017-10-04 22:18:05 +05:00
Campbell Barton
239b38cd64 CMake: avoid naming collision 2017-10-04 01:35:24 +11:00
Campbell Barton
cbe07d980c Python: bump minimum version to 3.6 2017-10-03 23:50:34 +11:00
Sergey Sharybin
2bfa061a15 Merge branch 'master' into blender2.8 
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-03 12:59:06 +05:00
Sergey Sharybin
9f8bb5813b Buildbot: Re-enable cuda binaries, those should work 2017-10-02 20:24:58 +05:00
Sergey Sharybin
9139532dc8 Buildbot: Use latest master config from buildbot 2017-10-01 10:34:04 +02:00
Sergey Sharybin
29ed5f301d Buildbot: Extra tweaks to packing rules 2017-10-01 10:01:45 +02:00
Sergey Sharybin
ca3f7021de Buildbot: Tweaks to current macOS config 
Also disable CUDA binaries for now, those would need some extra work.
 2017-10-01 10:00:42 +02:00
Campbell Barton
e3fe8128e4 Merge branch 'master' into blender2.8 2017-09-29 19:55:00 +10:00
Campbell Barton
5a1954a5cb Drop platform support for Solaris & AIX 
These platforms didn't see maintenance in years.
This commit just removes ifdef's & cmake check.
 2017-09-29 19:16:34 +10:00
Brecht Van Lommel
97eefc1fd9 Code cleanup: remove unnecessary buildbot code after macOS library upgrade. 2017-09-28 23:37:57 +02:00
Brecht Van Lommel
c10ac1bb5c macOS: officially upgrade to 10.9 libraries from lib/darwin. 
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-28 20:53:06 +02:00
Sergey Sharybin
7fdb9e168d Merge branch 'master' into blender2.8 2017-09-28 16:13:09 +05:00
Campbell Barton
0ae1a1ed48 CMake: move MSVC warnings to central location 2017-09-28 13:41:54 +10:00
Ray Molenkamp
5d23448290 [build_deps.cmd] Turn down logging verbosity to normal. 2017-09-27 10:54:27 -06:00
Ray Molenkamp
58f3f9c246 [msvc] treat C4133 as error instead of a warning to mimic gcc's -Werror=incompatible-pointer-types 
as requested by @campbellbarton and @mano-wii
 2017-09-27 10:11:00 -06:00