[Bf-blender-cvs] [3fb21e60107] soc-2019-npr: LANPR: Fix CPU mode overlay display error.
YimingWu
noreply at git.blender.org
Mon Jul 8 16:31:02 CEST 2019
Commit: 3fb21e601070c891a88d4df48ea5b65c8ee460a8
Author: YimingWu
Date: Mon Jul 8 22:24:03 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB3fb21e601070c891a88d4df48ea5b65c8ee460a8
LANPR: Fix CPU mode overlay display error.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_ops.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index bb0e3d000a2..0b98a1a60e2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -4145,8 +4145,12 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
unit_m4(indentity_mat);
DRWView *view = DRW_view_create(indentity_mat, indentity_mat, NULL, NULL, NULL);
- DRW_view_default_set(view);
- DRW_view_set_active(view);
+ if (is_render) {
+ DRW_view_default_set(view);
+ }
+ else {
+ DRW_view_set_active(view);
+ }
RegionView3D *rv3d = v3d ? draw_ctx->rv3d : NULL;
if (rv3d) {
@@ -4341,6 +4345,10 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
}
GPU_framebuffer_blit(fbl->software_ms, 0, dfb, 0, GPU_COLOR_BIT);
+
+ if (!is_render) {
+ DRW_view_set_active(NULL);
+ }
}
/* ============================================ operators =========================================
More information about the Bf-blender-cvs
mailing list