Commit: 5a3095ffb7de658ee9af9ac83ef5ae224494bcb8
Author: Antonioya
Date: Sun Feb 17 12:22:20 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5a3095ffb7de658ee9af9ac83ef5ae224494bcb8
Merge branch 'master' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_fill.c
index 91e2a21aa3e,649b4c7f911..e849e915e8a
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@@ -361,16 -315,30 +361,18 @@@ static bool gp_render_offscreen(tGPDfil
ImBuf *ibuf = IMB_allocImBuf(tgpf->sizex, tgpf->sizey, 32, flag);
rctf viewplane;
- float clipsta, clipend;
+ float clip_start, clip_end;
- is_ortho = ED_view3d_viewplane_get(tgpf->depsgraph, tgpf->v3d,
tgpf->rv3d, tgpf->sizex, tgpf->sizey, &viewplane, &clipsta, &clipend, NULL);
+ is_ortho = ED_view3d_viewplane_get(
+ tgpf->depsgraph, tgpf->v3d, tgpf->rv3d, tgpf->sizex,
tgpf->sizey,
+ &viewplane, &clip_start, &clip_end, NULL);
if (is_ortho) {
- orthographic_m4(winmat, viewplane.xmin, viewplane.xmax,
viewplane.ymin, viewplane.ymax, -clipend, clipend);
+ orthographic_m4(winmat, viewplane.xmin, viewplane.xmax,
viewplane.ymin, viewplane.ymax, -clip_end, clip_end);
}
else {
- perspective_m4(winmat, viewplane.xmin, viewplane.xmax,
viewplane.ymin, viewplane.ymax, clipsta, clipend);
+ perspective_m4(winmat, viewplane.xmin, viewplane.xmax,
viewplane.ymin, viewplane.ymax, clip_start, clip_end);
}
- /* set temporary new size */
- int bwinx = tgpf->ar->winx;
- int bwiny = tgpf->ar->winy;
- rcti brect = tgpf->ar->winrct;
-
- tgpf->ar->winx = (short)tgpf->sizex;
- tgpf->ar->winy = (short)tgpf->sizey;
- tgpf->ar->winrct.xmin = 0;
- tgpf->ar->winrct.ymin = 0;
- tgpf->ar->winrct.xmax = tgpf->sizex;
- tgpf->ar->winrct.ymax = tgpf->sizey;
-
GPU_matrix_push_projection();
GPU_matrix_identity_set();
GPU_matrix_push();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
