blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix add-object tools cursor distorted drawing on save 

Generating the thumbnail left the view matrices set to values
that couldn't be used for cursor drawing.

Backup/restore the matrices for off-screen drawing.
This commit is contained in:
Campbell Barton 2020-11-20 12:13:18 +11:00
parent f0b75cc19d
commit 5b34d11b55
Notes: blender-bot 2023-02-13 19:39:58 +01:00 
Referenced by commit 97cc130f47, Fix T85395: Texture paint external edit wrong projection on reapply
Referenced by issue #85395, External edited texture applied with incorrect projection (wrong lens settings?)
Referenced by issue #85395, External edited texture applied with incorrect projection (wrong lens settings?)
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -1685,12 +1685,21 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
/* #Region */
int region_winx, region_winy;
rcti region_winrct;
/* #RegionView3D */
/**
* Needed so the value won't be left overwritten,
* Without this the #wmPaintCursor can't use the pixel size & view matrices for drawing.
*/
struct RV3DMatrixStore *rv3d_mats;
} orig = {
.v3d_shading_type = v3d->shading.type,
.region_winx = region->winx,
.region_winy = region->winy,
.region_winrct = region->winrct,
.rv3d_mats = ED_view3d_mats_rv3d_backup(region->regiondata),
};
UI_Theme_Store(&orig.theme_state);
@ -1748,6 +1757,9 @@ void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
region->winy = orig.region_winy;
region->winrct = orig.region_winrct;
ED_view3d_mats_rv3d_restore(region->regiondata, orig.rv3d_mats);
MEM_freeN(orig.rv3d_mats);
UI_Theme_Restore(&orig.theme_state);
v3d->shading.type = orig.v3d_shading_type;

6
source/blender/python/gpu/gpu_py_offscreen.c
View File

@ -220,7 +220,6 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self,
struct ViewLayer *view_layer;
View3D *v3d;
ARegion *region;
struct RV3DMatrixStore *rv3d_mats;
BPY_GPU_OFFSCREEN_CHECK_OBJ(self);
@ -250,8 +249,6 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self,
depsgraph = BKE_scene_ensure_depsgraph(G_MAIN, scene, view_layer);
rv3d_mats = ED_view3d_mats_rv3d_backup(region->regiondata);
GPU_offscreen_bind(self->ofs, true);
ED_view3d_draw_offscreen(depsgraph,
@ -272,9 +269,6 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self,
GPU_offscreen_unbind(self->ofs, true);
ED_view3d_mats_rv3d_restore(region->regiondata, rv3d_mats);
MEM_freeN(rv3d_mats);
Py_RETURN_NONE;
}