Page MenuHome
Differential D12609

Paint: prevent RenderResults and Viewers where unappropriate
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Sep 23 2021, 9:31 AM.

Details

Reviewers
Jeroen Bakker (jbakker)
Brecht Van Lommel (brecht)
Maniphest Tasks
T91625: Paint: Using a RenderResult as a clone image crashes
Commits
rBfc2255135e31: Paint: prevent RenderResults and Viewers where unappropriate
Summary

Using a RenderResult (or a Viewer) was never really working (think you
cant get a real ImBuff from these) -- cannot use it as a clone, stencil
or canvas [Single Image paint texture slot].

In the case of using it as a 2D paint clone image this would also crash
[due to the Image Editor drawing refactor in 2.91].

Now [in the spirit of T73182 / D11179], prevent using these where
unappropriate by using rna pointer polling functions.

Also add a security check for the 2D paint clone image crash in case a
stencil ImBuff cannot be provided for some reason, but generally old files
are now patched in do_versions_after_linking_300 (thx @Brecht Van Lommel (brecht)!).

Fixes T91625.

Diff Detail

Repository
rB Blender

Event Timeline

Philipp Oeser (lichtwerk) requested review of this revision.Sep 23 2021, 9:31 AM
Philipp Oeser (lichtwerk) created this revision.
Harbormaster completed remote builds in B17252: Diff 42289.Sep 23 2021, 9:31 AM
Philipp Oeser (lichtwerk) added projects: Sculpt, Paint & Texture, EEVEE & Viewport.Sep 23 2021, 9:32 AM
Philipp Oeser (lichtwerk) mentioned this in T73182: Exclude 'Render Result' and 'Viewer' image types in the dropdown in certain contexts [Shader Editor, Compositor, UV Editor...].
Philipp Oeser (lichtwerk) mentioned this in D11179: Exclude 'Render Result' and 'Viewer' images where not supported T73182.
Brecht Van Lommel (brecht) requested changes to this revision.Sep 23 2021, 4:27 PM
Brecht Van Lommel (brecht) added inline comments.
source/blender/blenloader/intern/versioning_300.c
1463–1464

This code should be in do_versions_after_linking_300, datablock pointers have not been resolved yet in blo_do_versions_300.

This revision now requires changes to proceed.Sep 23 2021, 4:27 PM
Philipp Oeser (lichtwerk) updated this revision to Diff 42310.Sep 23 2021, 4:52 PM
Harbormaster completed remote builds in B17270: Diff 42310.Sep 23 2021, 4:52 PM
Philipp Oeser (lichtwerk) edited the summary of this revision. (Show Details)Sep 23 2021, 4:53 PM
Brecht Van Lommel (brecht) accepted this revision.Sep 23 2021, 5:32 PM
This revision is now accepted and ready to land.Sep 23 2021, 5:32 PM
Closed by commit rBfc2255135e31: Paint: prevent RenderResults and Viewers where unappropriate (authored by Philipp Oeser (lichtwerk)). · Explain WhySep 23 2021, 8:27 PM
This revision was automatically updated to reflect the committed changes.
Philipp Oeser (lichtwerk) added a commit: rBfc2255135e31: Paint: prevent RenderResults and Viewers where unappropriate.

Revision Contents
Changeset List

PathSize
source/
blender/
blenloader/
intern/
22 lines
draw/
engines/
overlay/
56 lines
makesrna/
intern/
7 lines
9 lines

Diff 42333

View Options

source/blender/blenloader/intern/versioning_300.c

Loading...
View Options

source/blender/draw/engines/overlay/overlay_edit_uv.c

Loading...
View Options

source/blender/makesrna/intern/rna_brush.c

Loading...
View Options

source/blender/makesrna/intern/rna_sculpt_paint.c

Loading...