griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
83,061 Commits 1 Branch 0 Tags
309d4bfbbc4114d314aa174fee96e716bc4fe5df
Commit Graph

2038 Commits

Author SHA1 Message Date
Ray Molenkamp
81449320e4 Merge remote-tracking branch 'origin/master' into blender2.8 2018-12-05 08:46:12 -07:00
Ray Molenkamp
4cb6d97691 deps: update opencollada to v1.6.68 2018-12-05 08:44:50 -07:00
Bastien Montagne
fb3f1a3567 Merge branch 'master' into blender2.8 2018-12-05 14:41:00 +01:00
Bastien Montagne
e7643ee6b4 Install_deps: bump collada version to 1.6.68. 2018-12-05 13:52:39 +01:00
Brecht Van Lommel
b9b88d59dd Merge branch 'master' into blender2.8 2018-12-04 16:35:16 +01:00
Brecht Van Lommel
f63da3dcf5 Buildbot: enable support for NVIDIA Turing cards in Cycles (like GTX 20xx). 
We currently only build the sm_7x kernels with CUDA 10.0, older cards still
use 9.1 until rendering errors are solved for them.
 2018-12-04 16:03:18 +01:00
Brecht Van Lommel
b14ec18601 Cycles: add initial CUDA 10.0 support, but only recommend use for Turing cards. 
There may still be rendering errors when used for older graphics cards.
 2018-12-04 16:03:18 +01:00
Campbell Barton
140f2209b6 Cleanup: correct typo, no need for ./ prefix 2018-11-29 12:54:30 +11:00
Campbell Barton
b02696f855 CMake: add missing files 2018-11-29 09:01:03 +11:00
Campbell Barton
1e10206590 Merge branch 'master' into blender2.8 2018-11-29 08:55:34 +11:00
Campbell Barton
fb057153b0 CMake: update checker 
Support skipping cmake files
 2018-11-29 08:55:05 +11:00
Sergey Sharybin
3ed0d5b4d4 Merge branch 'master' into blender2.8 2018-11-28 14:42:38 +01:00
Sergey Sharybin
683662e630 Add cross-platform NUMA library 
Makes it simple to use NUMA libraries on various platforms.
 2018-11-28 14:35:26 +01:00
Brecht Van Lommel
b71006ceed Fix T58088: OpenSubdiv not enabled by default in macOS builds. 2018-11-27 14:40:25 +01:00
Sergey Sharybin
0970ed0550 Merge branch 'master' into blender2.8 2018-11-26 12:00:36 +01:00
Sergey Sharybin
acd1d1a31d CMake: Remove Cycles specific OpenSubdiv options 
Just use one flag which enables OpenSubdiv globally for all the
areas of Blender.
 2018-11-26 11:41:38 +01:00
Brecht Van Lommel
920525c216 Merge branch 'master' into blender2.8 2018-11-23 12:11:44 +01:00
Brecht Van Lommel
956e58679c Fix T57998: crash at start with jemalloc package on some Linux distributions. 
The jemalloc library must be ahead of pthread in linking order, so jemalloc
can find the pthread symbols for its background thread.
 2018-11-23 11:26:31 +01:00
Brecht Van Lommel
146b39a45d Merge branch 'master' into blender2.8 2018-11-08 15:15:29 +01:00
Ray Molenkamp
406f36f574 build: add proper embree support to platform_win32.cmake 
made the use of findpackage optional and add support for debug builds
 2018-11-07 19:34:49 -07:00
Ray Molenkamp
d3b11de7d6 build_environment: add debug libs for embree on windows 2018-11-07 19:33:07 -07:00
Ray Molenkamp
cd9f3019f4 build_deps_windows: add option to to only create project files. 2018-11-07 19:18:53 -07:00
Stefan Werner
85a9744905 Merge branch 'master' into blender2.8 2018-11-07 20:44:40 +01:00
Stefan Werner
ee6cc1d558 install_deps: Added optional build of Embree to install_deps.sh, turned off by default. 2018-11-07 20:36:03 +01:00
Brecht Van Lommel
4610ca599a Merge branch 'master' into blender2.8 2018-11-07 14:54:32 +01:00
Brecht Van Lommel
33201a48b0 Fix build with OSL, remove unneeded file after Embree changes. 2018-11-07 14:38:07 +01:00
Stefan Werner
9d0eac6ba5 Merge branch 'master' into blender2.8 2018-11-07 14:30:09 +01:00
Stefan Werner
2c5531c0a5 Cycles: Added Embree as BVH option for CPU renders. 
Note that this is turned off by default and must be enabled at build time with the CMake WITH_CYCLES_EMBREE flag.
Embree must be built as a static library with ray masking turned on, the `make deps` scripts have been updated accordingly.
There, Embree is off by default too and must be enabled with the WITH_EMBREE flag.

Using Embree allows for much faster rendering of deformation motion blur while reducing the memory footprint.

TODO: GPU implementation, deduplication of data, leveraging more of Embrees features (e.g. tessellation cache).

Differential Revision: https://developer.blender.org/D3682
 2018-11-07 12:58:12 +01:00
Ray Molenkamp
ca30930e36 Merge remote-tracking branch 'origin/master' into blender2.8 2018-10-30 17:39:20 -06:00
Ray Molenkamp
5490708c39 make.bat: fix unquoted variables. 
causing build issues for some users.
 2018-10-30 17:36:36 -06:00
Ray Molenkamp
2dbddaf3be Fix "make update" on Windows not updating addons to the blender2.8 branch. 
based on rB8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f
 2018-10-30 07:55:45 -06:00
Brecht Van Lommel
046735d751 Merge branch 'master' into blender2.8 2018-10-28 16:41:30 +01:00
Brecht Van Lommel
47953dee79 Fix Linux build after Cryptomatte commit. 2018-10-28 14:55:55 +01:00
Ray Molenkamp
4bf4da12de Merge remote-tracking branch 'origin/master' into blender2.8 2018-10-22 10:19:06 -06:00
Ray Molenkamp
86dbbd156f Windows: Enable python debugging in Visual Studio. 
see D3817 for technical details, and https://wiki.blender.org/wiki/Tools/Debugging/Python_Visual_Studio for a end user quick-start guide.

Differential Revision: https://developer.blender.org/D3817
 2018-10-22 10:17:08 -06:00
Ray Molenkamp
be52fd0d0f Merge remote-tracking branch 'origin/master' into blender2.8 2018-10-19 09:16:26 -06:00
Ray Molenkamp
dcef3c30e3 build_depenencies: Fix url for openal. 2018-10-19 09:09:06 -06:00
Dalai Felinto
df816d534f Fix cmake not triggering rebuild on .glsl changes 
At least on windows we do not re-run datatoc when the .glsl files change.

To test is simple, just change edit_mesh_overlay_common_lib.glsl
remove lines, write plain text, ..., now rebuild and go in edit mode
with the default cube.

I also had to remove the entry in gpu/CMakeLists.txt for
gpu_shader_material.glsl since this was being tracked directly, as well
as running data_to_c_simple (otherwise CMake raises an error for
duplicated entries).

We probably want to do the same for the other datatoc functions.

Reviewers: LazyDodo, brecht
Differential Revision: https://developer.blender.org/D3803
 2018-10-17 11:24:33 +11:00
Dalai Felinto
28a3958cb3 Fix cmake not triggering rebuild on .glsl changes 
At least on windows we do not re-run datatoc when the .glsl files change.

To test is simple, just change edit_mesh_overlay_common_lib.glsl
remove lines, write plain text, ..., now rebuild and go in edit mode
with the default cube.

I also had to remove the entry in gpu/CMakeLists.txt for
gpu_shader_material.glsl since this was being tracked directly, as well
as running data_to_c_simple (otherwise CMake raises an error for
duplicated entries).

We probably want to do the same for the other datatoc functions.

Reviewers: LazyDodo, brecht
Differential Revision: https://developer.blender.org/D3803
 2018-10-16 16:58:12 -03:00
Ray Molenkamp
ddfd6b518c Merge remote-tracking branch 'origin/master' into blender2.8 2018-10-04 21:56:20 -06:00
Jorge Bernal
6e08b01bd9 Fix T57059: "make deps" build error when sndio library is present. 2018-10-04 13:34:08 +02:00
Brecht Van Lommel
e5387eef18 Merge branch 'master' into blender2.8 2018-10-03 12:12:22 +02:00
Brecht Van Lommel
d2da3af073 Fix T54287: memory not freed after rendering on Linux. 
With new jemalloc versions memory allocated by threads that then become
inactive is not longer automatically freed. Instead we have to enable a
background thread to do it.

Some testing is needed to find out of this is sufficient, because the
background thread only runs periodically.
 2018-10-03 12:09:31 +02:00
Ines Almeida
38402e7fdd Remove last traces of game engine and blenderplayer 2018-09-22 15:54:30 +02:00
Brecht Van Lommel
6b433f4eb3 Merge branch 'master' into blender2.8 2018-09-19 18:20:50 +02:00
Brecht Van Lommel
a4f2ebc78d Spelling fixes in comments and descriptions, patch by luzpaz. 
Differential Revision: https://developer.blender.org/D3700
 2018-09-19 18:18:05 +02:00
Ray Molenkamp
424839e3c2 make.bat: fix build error when there are spaces in the path to svn/git/cmake 2018-09-19 10:16:46 -06:00
Campbell Barton
0ad183bf02 Merge branch 'master' into blender2.8 2018-09-19 12:05:08 +10:00
Campbell Barton
4c918efd44 Cleanup: trailing space 2018-09-19 12:04:34 +10:00
Brecht Van Lommel
34ee9ab97c CMake: remove PYTHON_NUMPY_INCLUDE_DIRS as a cache variable on macOS/Windows. 
It's in a fixed location on those platforms, and having it as a cache variable
just means things break when we upgrade to a new Python version.
 2018-09-18 12:11:06 +02:00