blender
/
blender
128
395
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T49996: VSE opengl render crash with grease pencil if current frame is empty 

If the opengl render with grease pencil is run from VSE with the current
frame outside visible frames, the render pass is wrong and the render
must be canceled because nothing to render. Related to #T49975
This commit is contained in:
Antonio Vazquez 2016-11-11 22:27:10 +01:00
parent cdeaec3b0d
commit 674c3bf894
Notes: blender-bot 2023-02-14 07:25:46 +01:00 
Referenced by issue #49996, Crash of Blender when using Video Sequencer Editor (VSE) and Grease Pencil (GP)
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/render/render_opengl.c
View File

@ -485,23 +485,24 @@ static void add_gpencil_renderpass(OGLRender *oglrender, RenderResult *rr, Rende
/* copy image data from rectf */
// XXX: Needs conversion.
unsigned char *src = (unsigned char *)RE_RenderViewGetById(rr, oglrender->view_id)->rect32;
float *dest = rp->rect;
if (src != NULL) {
float *dest = rp->rect;
int x, y, rectx, recty;
rectx = rr->rectx;
recty = rr->recty;
for (y = 0; y < recty; y++) {
for (x = 0; x < rectx; x++) {
unsigned char *pixSrc = src + 4 * (rectx * y + x);
if (pixSrc[3] > 0) {
float *pixDest = dest + 4 * (rectx * y + x);
float float_src[4];
srgb_to_linearrgb_uchar4(float_src, pixSrc);
addAlphaOverFloat(pixDest, float_src);
int x, y, rectx, recty;
rectx = rr->rectx;
recty = rr->recty;
for (y = 0; y < recty; y++) {
for (x = 0; x < rectx; x++) {
unsigned char *pixSrc = src + 4 * (rectx * y + x);
if (pixSrc[3] > 0) {
float *pixDest = dest + 4 * (rectx * y + x);
float float_src[4];
srgb_to_linearrgb_uchar4(float_src, pixSrc);
addAlphaOverFloat(pixDest, float_src);
}
}
}
}
/* back layer status */
i = 0;
for (bGPDlayer *gph = gpd->layers.first; gph; gph = gph->next) {