Page MenuHome
Differential D10331

Fix T85395: Texture paint external edit wrong projection on reapply
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Feb 5 2021, 6:00 PM.

Details

Reviewers
Campbell Barton (campbellbarton)
Maniphest Tasks
T85395: External edited texture applied with incorrect projection (wrong lens settings?)
Commits
rB97cc130f472f: Fix T85395: Texture paint external edit wrong projection on reapply
Summary

Caused by rB5b34d11b55e0.

Above commit restored the view matrices in ED_view3d_draw_offscreen
_before_ they can be stored in the ImBuff (see ED_view3d_draw_offscreen
/ texture_paint_image_from_view_exec).

Now make restoring the view matrices optional and dont do this in case of reprojection, so the used matrices can still be saved in the ImBuff later.

Diff Detail

Repository
rB Blender

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Feb 5 2021, 6:00 PM
Harbormaster completed remote builds in B12663: Diff 33625.Feb 5 2021, 6:00 PM
Philipp Oeser (lichtwerk) requested review of this revision.Feb 5 2021, 6:00 PM
Philipp Oeser (lichtwerk) added a project: Sculpt, Paint & Texture.Feb 5 2021, 6:01 PM
Philipp Oeser (lichtwerk) mentioned this in T85395: External edited texture applied with incorrect projection (wrong lens settings?) .
Campbell Barton (campbellbarton) added a comment.Feb 6 2021, 2:54 PM

I'd rather avoid making this struct public, although I can see why this was done.

ED_view3d_draw_offscreen_imbuf and related functions are already hard to follow with their arguments, adding more arguments isn't so nice either.

We could optionally call this function with an option not to use backup/restore, which at least doesn't expose the struct.

Philipp Oeser (lichtwerk) updated this revision to Diff 33751.Feb 9 2021, 11:36 AM
  • review by campbellbarton (instead of exposing the original mats to the caller, make restoring them optional for the caller)
Harbormaster completed remote builds in B12747: Diff 33751.Feb 9 2021, 11:36 AM
Philipp Oeser (lichtwerk) updated this revision to Diff 33753.Feb 9 2021, 11:41 AM

always restore mats, only case to not do this is for reprojection

Harbormaster completed remote builds in B12749: Diff 33753.Feb 9 2021, 11:41 AM
Philipp Oeser (lichtwerk) edited the summary of this revision. (Show Details)Feb 10 2021, 9:19 AM
Campbell Barton (campbellbarton) accepted this revision.Feb 10 2021, 10:34 AM

With so many args we could move this into a struct, but that can be a separate commit, this LGTM.

This revision is now accepted and ready to land.Feb 10 2021, 10:34 AM
Closed by commit rB97cc130f472f: Fix T85395: Texture paint external edit wrong projection on reapply (authored by Philipp Oeser (lichtwerk)). · Explain WhyFeb 10 2021, 1:29 PM
This revision was automatically updated to reflect the committed changes.
Philipp Oeser (lichtwerk) added a commit: rB97cc130f472f: Fix T85395: Texture paint external edit wrong projection on reapply.

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
include/
2 lines
render/
1 line
sculpt_paint/
1 line
space_view3d/
11 lines
python/
gpu/
1 line
windowmanager/
intern/
1 line

Diff 33830

View Options

source/blender/editors/include/ED_view3d_offscreen.h

Loading...
View Options

source/blender/editors/render/render_opengl.c

Loading...
View Options

source/blender/editors/sculpt_paint/paint_image_proj.c

Loading...
View Options

source/blender/editors/space_view3d/view3d_draw.c

Loading...
View Options

source/blender/python/gpu/gpu_py_offscreen.c

Loading...
View Options

source/blender/windowmanager/intern/wm_files.c

Loading...