griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
79,536 Commits 1 Branch 0 Tags
3ef1aeb15ec8f8a07118eed2aa477f6c4e6e5efe
Commit Graph

969 Commits

Author SHA1 Message Date
Campbell Barton
81e99bdc75 Merge branch 'master' into blender2.8 2018-08-08 13:14:07 +10:00
Campbell Barton
bb8497fd5d Cleanup: correct header guard 
Header guard was duplicated before renaming.
 2018-08-08 13:11:57 +10:00
Campbell Barton
e71470e316 Merge branch 'master' into blender2.8 2018-08-08 11:53:22 +10:00
Campbell Barton
f86c965d7f Cleanup: use conforming header guard 2018-08-08 11:49:51 +10:00
Campbell Barton
cb58658f41 Cleanup: style 2018-08-08 10:59:50 +10:00
Campbell Barton
5f693d7442 Merge branch 'master' into blender2.8 2018-07-30 15:39:12 +10:00
Campbell Barton
9c960557a7 Cleanup: trailing space 2018-07-30 15:38:39 +10:00
Campbell Barton
4d978cc2e4 Cleanup: changes from 2.8 2018-07-24 13:59:35 +10:00
Campbell Barton
9df1e54079 Cleanup: style 2018-07-19 16:06:37 +10:00
Brecht Van Lommel
3d67819a17 Merge branch 'master' into blender2.8 2018-07-18 14:13:16 +02:00
Brecht Van Lommel
566b319335 Cleanup: Cryptomatte node style tweaks. 2018-07-18 13:59:06 +02:00
Stefan Werner
bdda0964e0 Compositor: Cryptomatte compositing node. 
This patch adds a new matte node that implements the Cryptomatte specification.
It also incluces a custom eye dropper that works outside of a color picker.
Cryptomatte export for the Cycles render engine will be in a separate patch.

Reviewers: brecht

Reviewed By: brecht

Subscribers: brecht

Tags: #compositing

Differential Revision: https://developer.blender.org/D3531
 2018-07-18 13:03:34 +02:00
Campbell Barton
c7c7bfae75 Merge branch 'master' into blender2.8 2018-07-13 12:22:21 +02:00
Charlie Jolly
30bffb5a3a Nodes: add sqrt, ceil, floor and fract to math nodes. 
This works for Cycles, Eevee, texture nodes and compositing. It helps to
reduce the number of math nodes required in various node setups.

Differential Revision: https://developer.blender.org/D3537
 2018-07-13 11:00:10 +02:00
Campbell Barton
f5d096798c Merge branch 'master' into blender2.8 2018-07-05 22:50:07 +02:00
Campbell Barton
52655f5161 Cleanup: flag checks 2018-07-05 22:49:42 +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
Campbell Barton
06a1a66a9b Merge branch 'master' into blender2.8 2018-06-17 17:10:19 +02:00
Campbell Barton
a262ea8c47 Cleanup: trailing space for compositor 2018-06-17 17:05:29 +02:00
Campbell Barton
43ce201125 Merge branch 'master' into blender2.8 2018-06-17 11:57:49 +02:00
Campbell Barton
2f1e34cfcc Cleanup: use clamp_* from BLI_math (replace macro) 2018-06-17 11:50:56 +02:00
Bastien Montagne
b9c9b87fa6 Cleanup: remove BLI_frand ugly global random generator usage from compositor. 2018-06-14 16:25:39 +02:00
Bastien Montagne
204c167c72 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c
 2018-06-11 16:02:46 +02:00
Bastien Montagne
78a8d3685b Cleanup: remove moar ugly G.main usages... 
BKE_image was an ugly nest, could fix all but the ones from compositor,
so moved ugly G.main there, at least we know where the Evil is that way ;)
 2018-06-11 15:40:37 +02:00
Bastien Montagne
f0d9dbae0d Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenloader/intern/readfile.h
	source/blender/blenloader/intern/versioning_250.c
	source/blender/blenloader/intern/versioning_260.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/blenloader/intern/versioning_legacy.c
	source/blender/editors/render/render_shading.c
	source/blender/makesrna/intern/rna_movieclip.c
	source/blender/render/intern/source/pipeline.c
	source/blender/render/intern/source/voxeldata.c
 2018-06-05 17:02:50 +02:00
Bastien Montagne
481cdb08ed Cleanup: use new accessors to blendfile path (Main.name). 2018-06-05 16:33:46 +02:00
Campbell Barton
bfe1d0e0dc Merge branch 'master' into blender2.8 2018-06-01 18:26:42 +02:00
Campbell Barton
75fc1c3507 Cleanup: trailing whitespace (comment blocks) 
Strip unindented comment blocks - mainly headers to avoid conflicts.
 2018-06-01 18:19:39 +02:00
Campbell Barton
ef22d2e8ad Merge branch 'master' into blender2.8 2018-05-25 10:04:25 +02:00
Lukas Stockner
6862762685 Cycles/Compositor: Add arctan2 operation to the Math node 
The Math node currently has the normal atan() function, but for
actual angles this is fairly useless without additional nodes to handle the signs.

Since the node has two inputs anyways, it only makes sense to add an arctan2 option.

Reviewers: sergey, brecht

Differential Revision: https://developer.blender.org/D3430
 2018-05-24 16:46:02 +02:00
Campbell Barton
2451a1951e Merge branch 'master' into blender2.8 2018-05-18 11:02:39 +02:00
Aaron Carlisle
96fba1e101 Color: Assume Rec 709 in remaining comp nodes 
Part of T54798
 2018-05-17 17:20:32 -04:00
Campbell Barton
a92557f77b Merge branch 'master' into blender2.8 2018-05-09 10:02:33 +02:00
Aaron Carlisle
80844fdfc0 Color: Combine/Separate YCbCrA node default to rec. 709 
This commit is part of T54798

Differential Revision: https://developer.blender.org/D3183
 2018-05-08 22:24:58 -04:00
Campbell Barton
f62b826533 Merge branch 'master' into blender2.8 2018-05-07 17:54:10 +02:00
Campbell Barton
905eeb0bc7 Cleanup: move unit char/short/float to functions 
This caused GCC 8.1 to crash at build time,
but was also not very nice use of macros.
 2018-05-07 17:50:25 +02:00
Brecht Van Lommel
e684e0ec95 Cleanup: fix warnings, removed unused code. 2018-05-03 16:33:12 +02:00
Campbell Barton
d09920687c Merge branch 'master' into blender2.8 2018-05-02 12:46:14 +02:00
Aaron Carlisle
128506eeb1 BLI Color: YUV to/from rgb colorspace option 
This commit does two things:

- Adds an option to do the calculation in different color spaces (BT601
or BT709).
- Changes the default caluclation from legacy BT601 to BT709.

This affects several areas:

- UI areas (mainly scopes)
- ViewLevelsNode
- Several other nodes that use `COM_ConvertOperation.h`
 2018-04-29 18:00:45 -04:00
Campbell Barton
9a11aeb300 Merge branch 'master' into blender2.8 2018-04-16 17:24:20 +02:00
Campbell Barton
85de548e03 Cleanup: indentation 2018-04-16 17:08:27 +02:00
Campbell Barton
f3a8f97fcf Merge branch 'master' into blender2.8 2018-04-15 10:52:14 +02:00
Campbell Barton
3a10f8e1b1 Cleanup: style 2018-04-14 22:26:12 +02:00
Bastien Montagne
07fc6c9224 Merge branch 'master' into blender2.8 2018-04-13 12:19:31 +02:00
Jeroen Bakker
d213474070 Moved vectorblur code from render to compositor 
In preparation of the removal of blender internal render we
moved the vectorblur code that was placed in the render package
(legacy) to the compositor. The compositor is only using this
code even the blender internal renderer did not use the code at
all.
 2018-04-12 10:27:38 +02:00
Campbell Barton
e52beb3733 Merge branch 'master' into blender2.8 2018-04-03 18:12:39 +02:00
Campbell Barton
bfdb88f3f4 Cleanup: rename list count_ex -> count_at_most 2018-04-03 17:05:21 +02:00
Sergey Sharybin
84a154ac68 Merge branch 'master' into blender2.8 2018-03-05 16:14:46 +01:00
Sergey Sharybin
63d8ccf9ff Fix T54225: Blur node stopped working when Map Range was fed with image 
The issue was happening with fast Gaussian blur, and caused by NaN value pixels
in the input buffer.

Now made it so Map Range output does not produce NaN, by returning arbitrary
value of 0. Still better than NaN!
 2018-03-05 11:44:42 +01:00