Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-03-15 22:11:53 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-03-17 19:33:08 +0300
commit1504cb26b0aa4e91b5c0ec432d2702d9e9c5275f (patch)
tree04fd27b90f3637885e25b59dac6bdf73f36c652d /intern/cycles/render/image.cpp
parent2518f601094bfa14474c24c3a1e640b9fca0e6e2 (diff)
Cleanup: process colorspace conversion with a 1D pixel array
No need to assume it's 2D or 3D.
Diffstat (limited to 'intern/cycles/render/image.cpp')
-rw-r--r--intern/cycles/render/image.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 8868811b5e7..df8226fb79f 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -534,7 +534,7 @@ bool ImageManager::file_load_image(Image *img, int texture_limit)
img->metadata.colorspace != u_colorspace_srgb) {
/* Convert to scene linear. */
ColorSpaceManager::to_scene_linear(
- img->metadata.colorspace, pixels, width, height, depth, img->metadata.compress_as_srgb);
+ img->metadata.colorspace, pixels, num_pixels, img->metadata.compress_as_srgb);
}
}