archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T42961: GPencil - Refactor object/scene data behaviour

Browse Source 
D937 with minor edits (whitespace only)

@aligorith, I double checked everything runs smoothly, blame me if I missed something ;). Sorry for just taking the initiative and committing without talking to you, but I wasn't able to catch you the last days. This should be fixed before the release IMHO, but I don't think it's important enough to be committed during BCon5, so sorry again, but hopefully everything is okay :)
This commit is contained in:
julianeisel
2014-12-20 16:18:18 +01:00
parent c2e56a5267
commit 071ec918f4
4 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
glTranslatef(sizex / 2, sizey / 2, 0.0f);
G.f |= G_RENDER_OGL;
ED_gpencil_draw_ex(gpd, sizex, sizey, scene->r.cfra);
ED_gpencil_draw_ex(scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ);
G.f &= ~G_RENDER_OGL;
gp_rect = MEM_mallocN(sizex * sizey * sizeof(unsigned char) * 4, "offscreen rect");