diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 16:38:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-19 20:23:19 +0300 |
| commit | 83de13f75aafca7d4e1d58ddd36cca19121aa84f (patch) | |
| tree | b8215ab3ba18ca729d0f3119e0f5cd6540054e33 /intern/cycles/blender/blender_util.h | |
| parent | 5b7b7101c81ca104111e0df76cccf5b1c88bd3f6 (diff) | |
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
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index eb7019f45bc..a2c1a68c454 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -32,7 +32,6 @@ * todo: clean this up ... */ extern "C" { -size_t BLI_timecode_string_from_time_simple(char *str, size_t maxlen, double time_seconds); void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr); void BKE_image_user_file_path(void *iuser, void *ima, char *path); unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame); |