[Bf-blender-cvs] [a99ab7eb063] temp-lanpr-cleanup2: LANPR: Viewport and F12 is both aligned correctly.
YimingWu
noreply at git.blender.org
Thu Nov 7 06:33:35 CET 2019
Commit: a99ab7eb063c76cd7f720e6f78525f53544a155f
Author: YimingWu
Date: Thu Nov 7 13:32:27 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rBa99ab7eb063c76cd7f720e6f78525f53544a155f
LANPR: Viewport and F12 is both aligned correctly.
Note: F12 sometimes produce viewport result....
===================================================================
M source/blender/draw/engines/lanpr/lanpr_cpu.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 6c5db708ca6..5aa153c582d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -246,11 +246,16 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
int texw = GPU_texture_width(txl->ms_resolve_color),
texh = GPU_texture_height(txl->ms_resolve_color);
- ;
- pd->output_viewport[2] = scene->r.xsch;
- pd->output_viewport[3] = scene->r.ysch;
+
pd->dpix_viewport[2] = texw;
pd->dpix_viewport[3] = texh;
+ if(is_render){
+ pd->output_viewport[2] = scene->r.xsch;
+ pd->output_viewport[3] = scene->r.ysch;
+ }else{
+ pd->output_viewport[2] = texw;
+ pd->output_viewport[3] = texh;
+ }
unit_m4(indentity_mat);
copy_m4_m4(win_mat, indentity_mat);
@@ -266,7 +271,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
}
RegionView3D *rv3d = v3d ? draw_ctx->rv3d : NULL;
- if (rv3d) {
+ if ((!is_render) && (rv3d && rv3d->view == RV3D_CAMOB)) {
camdx = rv3d->camdx;
camdy = rv3d->camdy;
camzoom = BKE_screen_view3d_zoom_to_fac(rv3d->camzoom);
More information about the Bf-blender-cvs
mailing list