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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-09-15 17:34:10 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-15 17:34:10 +0300
commit04e2e4fdc12ba8e7d93f8218da8a4195be816965 (patch)
tree878c9728eeb84ccd5e326a10a42e934b457833d3 /source/blender/editors/render/render_opengl.c
parent2d81e888654015f9a6cf78357259d2254fb4d1c0 (diff)
Fix mistake in previous commit
Was copying things in other way around and was not performing proper color space conversion.
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
-rw-r--r--source/blender/editors/render/render_opengl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a06251d93e1..46353ec4a44 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -478,7 +478,7 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende
if (pixSrc[3] > 0) {
float *pixDest = dest + 4 * (rectx * y + x);
float float_src[4];
- F4TOCHAR4(float_src, pixSrc);
+ srgb_to_linearrgb_uchar4(float_src, pixSrc);
addAlphaOverFloat(pixDest, float_src);
}
}