griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
78,443 Commits 1 Branch 0 Tags
f2de8a190fea052a33a2fbcc61d56e8ebe5a9017
Commit Graph

4772 Commits

Author SHA1 Message Date
Brecht Van Lommel
dbdafe1209 Shaders: add target setting to material output node. 
This makes it possible to have a single shading nodetree that contains
separate Cycles and Eevee shaders. By default the target is set to All
so shaders are shared.
 2018-07-05 18:43:48 +02:00
Campbell Barton
49b86bcfec Merge branch 'master' into blender2.8 2018-07-05 07:54:47 +02:00
Lukas Stockner
c960804747 Cycles Denoising: Pass tile buffers to every OpenCL kernel to conform to standard and get rid of set_tile_info 2018-07-04 14:38:03 +02:00
Lukas Stockner
f1525cf534 Cycles Denoising: Correctly handle target buffer in tile unmapping and move device swap logic to the device_memory 2018-07-04 14:37:55 +02:00
Lukas Stockner
9db8bdbc65 Cycles Denoising: Cleanup: Rename tiles to tile_info 2018-07-04 14:37:24 +02:00
Lukas Stockner
97a0d6fcc7 Cycles Denoising: Refactor denoiser tile handling 
This deduplicates the calls for tile (un)mapping and allows to have a target buffer that is different from the source buffer (needed for baking and animation denoising).
 2018-07-04 14:36:01 +02:00
Lukas Stockner
b10c64bd2f Cycles Denoising: Split main function into logical steps 2018-07-04 14:35:05 +02:00
Campbell Barton
c2814f5b28 Merge branch 'master' into blender2.8 2018-07-02 18:18:16 +02:00
Sergey Sharybin
e5767eaad1 Cycles: Fix missing curve hair when building with GCC-8 in release mode 
Reshuffle cast intrinsics to make XOR to operate on __m128i rather
than on __m128.

Hopefully this does not affect performance.
 2018-07-02 15:16:14 +02:00
Campbell Barton
37994e0af2 Merge branch 'master' into blender2.8 2018-07-01 20:15:21 +02:00
Brecht Van Lommel
9c5203c98f Fix T55626, fix T55106: Cycles motion blur + persistent images bug. 2018-07-01 16:32:35 +02:00
Campbell Barton
36a9436d80 Merge branch 'master' into blender2.8 2018-07-01 16:22:06 +02:00
Campbell Barton
ddee0931b8 RNA: use bool for boolean RNA types 
We were using int's for bool arguments in BKE,
just to avoid having wrapper functions.
 2018-07-01 15:57:59 +02:00
Campbell Barton
bc95c7a3ea Cleanup: remove num argument prefix 2018-07-01 09:23:51 +02:00
Campbell Barton
25b7bdb6a9 Merge branch 'master' into blender2.8 2018-06-30 09:29:38 +02:00
Brecht Van Lommel
ccacf3ae3c Cycles: change AO node default to 16 samples and only local off. 2018-06-29 15:43:55 +02:00
Campbell Barton
18d87e79e9 Merge branch 'master' into blender2.8 2018-06-29 09:25:40 +02:00
Campbell Barton
b372766816 Cleanup: trailing newlines 2018-06-29 09:23:51 +02:00
Brecht Van Lommel
8b2297847f Merge branch 'master' into blender2.8 2018-06-28 00:13:52 +02:00
Brecht Van Lommel
9536f67e7e Fix Cycles tests build on macOS. 2018-06-28 00:11:01 +02:00
William Reynish
d48600fddc UI: Single-column layout for Lamp panel 2018-06-27 14:23:17 +02:00
Sybren A. Stüvel
b4c01aca30 Merge branch 'master' into blender2.8 2018-06-26 17:42:33 +02:00
William Reynish
25caedc4ba UI: Tweaks to Cycles Bake panel 
-Correctly aligns bake options in the column
-Updated Metadata panel with right-aligned checkboxes for consistency
 2018-06-26 14:17:02 +02:00
Stefan Werner
73eb1bfd55 Revert "Turned off clang warnings in third party includes." 
This reverts commit d53093953f.
 2018-06-26 10:26:56 +02:00
Campbell Barton
ea339dc62c Merge branch 'master' into blender2.8 2018-06-26 09:34:13 +02:00
Lukas Stockner
87f598fd3f Cycles: Fix wrong row count for World MIS CDF calculation 2018-06-26 05:35:30 +02:00
Stefan Werner
d53093953f Turned off clang warnings in third party includes. 
The latest clang compiler (at least the one in Xcode 9.4.1) warns about the register keyword and macro expansions using defined().
Since these warnings come from third party code, we can't address them directly in Blender. Silencing them via #pramgas will
at least keep the warnings during a build down to the ones that are relevant to Blender code.
 2018-06-25 23:02:01 +02:00
Sergey Sharybin
7cd86cd1fe Cycles: Fix memory leak with session 
We didn't check for sync object being already allocated.
In fact, we simply need to use proper function to free
session.
 2018-06-25 17:28:46 +02:00
Sergey Sharybin
cdee53edfc Cycles: Cleanup, indentation 2018-06-25 12:39:44 +02:00
Campbell Barton
d32e4ca701 Merge branch 'master' into blender2.8 2018-06-25 07:43:51 +02:00
Brecht Van Lommel
574c716f2d Cycles: change AO node color default to 1.0. 2018-06-24 12:24:30 +02:00
Campbell Barton
78653cfb8c Merge branch 'master' into blender2.8 2018-06-21 16:43:39 +02:00
Brecht Van Lommel
cd6cb55ff3 Fix Cycles incorrect versioning for automatic sample world resolution. 2018-06-21 15:28:59 +02:00
Campbell Barton
c054a1a848 Merge branch 'master' into blender2.8 2018-06-21 15:02:38 +02:00
Brecht Van Lommel
a283333cd8 Fix Cycles CUDA render errors with CUDA 9.2. 
Work around what might be a compiler bug.
 2018-06-21 12:32:32 +02:00
Brecht Van Lommel
d6313f47af Fix T55564: Cycles OpenCL build error on some scenes. 2018-06-21 11:46:52 +02:00
Campbell Barton
7d3589e660 Cleanup: pep8, single quotes for enums 2018-06-20 18:22:52 +02:00
Bastien Montagne
61af6b83e6 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c
 2018-06-19 16:49:54 +02:00
Stefan Werner
9ff135d85d Cycles: Fixed crash when the camera was inside 16 volumes or more. It still won't render those volumes correctly, but at least the crash is addressed. 2018-06-19 16:35:18 +02:00
Brecht Van Lommel
a7e66d89d0 Merge branch 'master' into blender2.8 2018-06-19 16:21:35 +02:00
Brecht Van Lommel
668f39519c Fix T55528: Cycles AO node should default to 1 if radius is 0. 2018-06-19 11:45:05 +02:00
Campbell Barton
05dc109553 Merge branch 'master' into blender2.8 2018-06-17 20:37:10 +02:00
Campbell Barton
e7a68ef843 Cleanup: trailing space in CMake files 2018-06-17 20:15:24 +02:00
Campbell Barton
5600296c9d Merge branch 'master' into blender2.8 2018-06-16 15:28:57 +02:00
Lukas Stockner
b955747875 Cycles Cleanup: Remove unneccessary color management call 2018-06-16 13:47:49 +02:00
Brecht Van Lommel
01f576e87b Merge branch 'master' into blender2.8 
The Eevee AO node supports the new Normal socket, but ignores Distance,
Samples, Inside and Only Local settings.
 2018-06-15 23:16:49 +02:00
Lukas Stockner
799779d432 Cycles: change Ambient Occlusion shader to output colors. 
This means the shader can now be used for procedural texturing. New
settings on the node are Samples, Inside, Local Only and Distance.

Original patch by Lukas with further changes by Brecht.

Differential Revision: https://developer.blender.org/D3479
 2018-06-15 22:16:06 +02:00
Brecht Van Lommel
23b3901057 Merge branch 'master' into blender2.8 2018-06-15 16:32:31 +02:00
Brecht Van Lommel
2e25a48b05 Fix more Cycles CUDA errors after recent changes. 2018-06-15 16:28:09 +02:00
Philipp Oeser
76bc8669a0 Merge branch 'master' into blender2.8 2018-06-15 10:44:33 +02:00