diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
| commit | a640587e25e43be8007fa0090a59fd9bb6d51e39 (patch) | |
| tree | ef780ec436232535a9e36ac233de1792ee8ba9e4 /intern/cycles/render/colorspace.h | |
| parent | 99eb95337f74f1a303c774902ea29f7d378bac1b (diff) | |
| parent | 892637f60afbbb787334caa26f5342baf1d4a7d7 (diff) | |
Merge branch 'temp-openxr-blenderside' into soc-2019-openxrsoc-2019-openxr
Diffstat (limited to 'intern/cycles/render/colorspace.h')
| -rw-r--r-- | intern/cycles/render/colorspace.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/render/colorspace.h b/intern/cycles/render/colorspace.h index 9fea2d6efc6..51d0b121cc0 100644 --- a/intern/cycles/render/colorspace.h +++ b/intern/cycles/render/colorspace.h @@ -45,9 +45,7 @@ class ColorSpaceManager { template<typename T> static void to_scene_linear(ustring colorspace, T *pixels, - size_t width, - size_t height, - size_t depth, + size_t num_pixels, bool compress_as_srgb); /* Efficiently convert pixels to scene linear colorspace at render time, |