2bc952fdb6
Merge branch 'master' into blender2.8
2018-02-18 22:33:05 +11:00
2eaf90b305
Cycles: Remove Fermi support from CMake and update runtime checks in device_cuda.cpp.
...
Fermi code in Cycles kernel and texture system are coming next.
2018-02-17 16:15:07 +01:00
75396edb31
Buildbot: Disable Cycles CUDA support on 32bit, and stop building sm_2x.
2018-02-17 15:49:37 +01:00
b330804ff3
Merge branch 'master' into blender2.8
2018-02-14 01:06:41 +11:00
37ce77ba06
Buildbot: Remove usage of deprecated chroot
2018-02-12 17:56:19 +01:00
9b9861578d
Merge branch 'master' into blender2.8
2018-02-09 13:56:49 +11:00
8f9386596f
CMake: include missing headers
2018-02-09 13:50:05 +11:00
9278614115
Merge branch 'master' into blender2.8
2018-02-08 16:27:28 +01:00
e0597baed5
Remove Carve boolean
...
We've got quite comprehensive BMesh based implementation, which is way easier
for maintenance than abandoned Carve library.
After all the time BMesh implementation was working on the same level of
limitations about manifold meshes and touching edges than Carve. Is better
to focus on maintaining one boolean implementation now.
Reviewers: campbellbarton
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D3050
2018-02-08 15:37:44 +01:00
eeb621566a
Merge branch 'master' into blender2.8
2018-02-04 10:46:34 +11:00
36c1122b96
msvc: Use source folder structure for project file.
...
This patch changes the huge list of projects in visual studio into a nice tree matching the source folder structure. see D2823 for details.
Differential Revision: http://developer.blender.org/D2823
2018-02-03 16:38:27 -07:00
c3eb22e2ab
Merge branch 'master' into blender2.8
2018-02-02 14:15:29 +11:00
1a840c3e27
Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmake
...
Differential Revision: https://developer.blender.org/D3032
2018-02-01 08:26:14 -07:00
88174bd22c
Merge branch 'master' into blender2.8
2018-01-28 15:18:33 +11:00
19b1b45d71
make_quickie: replace os.system w/ subprocess.call
2018-01-26 12:53:42 +11:00
0f14c72c29
project_info: replace os.system w/ subprocess.check_call
2018-01-26 12:38:07 +11:00
7389bfdeb0
Merge branch 'master' into blender2.8
2018-01-24 11:45:34 +11:00
bd5696f857
CMake: store icon names
...
Without this, adding/removing icons wouldn't force cmake to re-run
making builds fail.
This is the same issue with globbing source code.
2018-01-24 11:32:58 +11:00
4ebcdff873
Merge branch 'master' into blender2.8
2018-01-23 20:04:54 +11:00
41e930ac66
Cleanup: CMake whitespace
2018-01-23 17:25:09 +11:00
10e6da1f2d
Merge branch 'master' into blender2.8
2018-01-17 17:47:38 +01:00
a8fc44299b
external_libs: Add openjpeg to the mavc lib folders for cycles standalone.
2018-01-17 07:45:05 -07:00
cdc31c3e6e
Merge branch 'master' into blender2.8
2018-01-13 02:05:49 +01:00
6b3d85fa51
Build: auto detection of libraries built by "make deps" on Linux.
...
Use the libraries if they exist in ../lib/linux_x86_64 or similar, so
that you can run "make deps && make full" to get a full static build.
Note that install_deps.sh is still the only officially supported way to
build Blender dependencies on Linux, but this may be useful to some.
Differential Revision: https://developer.blender.org/D2980
2018-01-11 22:30:31 +01:00
83e84b2c2c
Merge branch 'master' into blender2.8
2018-01-09 12:52:13 +01:00
850f73638c
install_deps: Fix OCIO always re-cloning its whole git repository.
2018-01-08 16:34:34 +01:00
5a6a819b5d
Merge branch 'master' into blender2.8
2018-01-04 10:36:50 +01:00
25418be97e
build deps: llvm new website download locations
2018-01-03 14:52:25 +02:00
be40389165
Merge branch 'master' into blender2.8
2018-01-03 23:44:47 +11:00
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
ac934efc5e
Build: fix make deps TBB on Linux, older versions don't support GCC 7.
2017-12-30 00:07:33 +01:00
6a225a283e
Build: fix make deps OpenSubdiv build on Linux.
2017-12-29 22:53:32 +01:00
4737b95b65
Merge branch 'master' into blender2.8
2017-12-11 19:24:37 +11:00
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
1c0905be0f
Merge branch 'master' into blender2.8
2017-12-08 00:21:54 +11:00
efdd8f12a0
CMake: GREATER_EQUAL is from v3.7, use GREATER
2017-12-08 00:20:48 +11:00
7ca8af4cc8
Merge branch 'master' into blender2.8
2017-12-06 16:51:37 +11:00
2480a190de
CMake: remove git found message
2017-12-06 16:37:50 +11:00
272973804e
Merge branch 'master' into blender2.8
2017-12-05 19:04:34 +01:00
a580565086
CMake: avoid checking each MSVC minor revision
2017-12-06 03:38:44 +11:00
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
03a5eccc94
Merge branch 'master' into blender2.8
2017-11-30 18:30:41 +11:00
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
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
42dff6cc2e
Cycles: Fix compilation error with OIIO compiled against system PugiXML
2017-11-13 10:42:29 +01:00
2440415bd3
Merge branch 'master' into blender2.8
2017-11-07 03:08:24 +01:00
956ee5e265
macOS: remove old OpenMP lib stuff from cmake
2017-11-06 23:54:35 +02:00
58dc114615
Merge branch 'master' into blender2.8
2017-11-06 00:12:28 +11:00
