griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
80,579 Commits 1 Branch 0 Tags
202baaaa169fbd21f5b3680681bdb02b2a6e5c19
Commit Graph

985 Commits

Author SHA1 Message Date
Campbell Barton
f35e9f047a Merge branch 'master' into blender2.8 2018-09-19 12:14:36 +10:00
Campbell Barton
2a14807f39 Merge branch 'master' into blender2.8 2018-09-13 07:50:45 +10:00
Campbell Barton
6873f47ede Cleanup: GCC ignored qualifier warning 2018-09-13 07:42:38 +10:00
Campbell Barton
bb9b0fcdbe Cleanup: remove unused field args 2018-09-10 14:05:33 +10:00
Brecht Van Lommel
3733c52985 Merge branch 'master' into blender2.8 2018-09-06 20:11:18 +02:00
Brecht Van Lommel
d1ab109619 Fix T56698: saving render result from compositing as EXR is empty. 2018-09-06 17:46:34 +02:00
Bastien Montagne
8a3adaa485 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_node/drawnode.c
 2018-09-06 11:31:58 +02:00
Sergey Sharybin
b07d866cf6 Compositor: Always use AA on masks 
In a real world it is very weird to disable AA on a mask,
it will give ugly looking result. For some fast preview
passes (like in the node preview) the system can decide
to disable AA without asking user to do anything.

One thing we can consider doing is to remove Feather
option as well. If real compo becomes measurably slower
in cases when mask has no real feather, we can disable
feather internally, without user input. Disabling
feather in the interface is like making things faster
but giving a wrong result, which doesn't sound that
helpful either.

Reviewers: brecht

Reviewed By: brecht

Subscribers: hype, sebastian_k

Differential Revision: https://developer.blender.org/D3677
 2018-09-06 11:26:19 +02:00
Campbell Barton
8ceff4c9ee Merge branch 'master' into blender2.8 2018-09-05 15:01:58 +10:00
Campbell Barton
44d4a61ed0 Cleanup: replace doxy @ with backslash 
The rest of Blender uses backslashes.
 2018-09-05 14:56:29 +10:00
Campbell Barton
0ddf3e110e Cleanup: comment blocks 2018-09-02 18:51:31 +10:00
Campbell Barton
ae57383648 Cleanup: comment blocks 2018-09-02 18:28:27 +10:00
Campbell Barton
0efecba957 Merge branch 'master' into blender2.8 2018-08-30 01:38:16 +10:00
Campbell Barton
39eb051616 Cleanup: indentation 2018-08-30 01:31:20 +10:00
Campbell Barton
3ee0ce27fa Cleanup: style 2018-08-26 20:34:33 +10:00
Campbell Barton
0cf12dfc14 Cleanup: indentation, style 2018-08-24 10:32:57 +10:00
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