[Bf-blender-cvs] [04e2e4f] master: Fix mistake in previous commit
Sergey Sharybin
noreply at git.blender.org
Thu Sep 15 16:34:44 CEST 2016
Commit: 04e2e4fdc12ba8e7d93f8218da8a4195be816965
Author: Sergey Sharybin
Date: Thu Sep 15 16:34:10 2016 +0200
Branches: master
https://developer.blender.org/rB04e2e4fdc12ba8e7d93f8218da8a4195be816965
Fix mistake in previous commit
Was copying things in other way around and was not performing
proper color space conversion.
===================================================================
M source/blender/editors/render/render_opengl.c
===================================================================
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a06251d..46353ec 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);
}
}
More information about the Bf-blender-cvs
mailing list