4 Commits

Include renames

Author	SHA1	Message	Date
Campbell Barton	e12c08e8d1	ClangFormat: apply to source, most of intern ... Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat	2019-04-17 06:21:24 +02:00
Brecht Van Lommel	d7cecc2ba3	Fix cycles.merge_images not merging correctly for some channel layouts.	2019-03-20 18:39:26 +01:00
Brecht Van Lommel	b06d32e4be	Cycles: make cycles.merge_images work with incomplete layers and passes. ... If layers and passes are not exactly the same in all files, we make a best effort to merge them instead of failing.	2019-03-20 17:26:25 +01:00
Brecht Van Lommel	83de13f75a	Cycles: add cycles.merge_images operator for combing EXR renders. ... This is only available through the API, mainly intended for render farms to combine rendered multilayer EXR Files with different samples. The images are currently expected to have the exact same render layers and passes, just with different samples. Variance passes are still simply a weighted average, ideally these should be merged more intelligently. Differential Revision: https://developer.blender.org/D4554	2019-03-19 18:23:19 +01:00