Page MenuHome
Differential D10014

Fix T84420: Linking regular materials to gpencil
ClosedPublic
Actions

Authored by Falk David (filedescriptor) on Jan 6 2021, 11:47 AM.

Details

Reviewers
Antonio Vazquez (antoniov)
Maniphest Tasks
T84420: Linking Materials causes Regular Materials to be used in Grease Pencil
Commits
rB5cdf279ef46f: Fix T84420: Linking regular materials to gpencil
Summary

When using "Make Links"->"Materials" regular materials could be linked
onto grease pencil objects. This caused a number of issues.

The fix changes the allow_make_links_data function to make sure that
if one object is of type OB_GPENCIL, the other has to be aswell.

Diff Detail

Repository
rB Blender
Branch
T84420 (branched from master)
Build Status
Buildable 12017
Build 12017: arc lint + arc unit

Event Timeline

Falk David (filedescriptor) requested review of this revision.Jan 6 2021, 11:47 AM
Falk David (filedescriptor) created this revision.
Harbormaster completed remote builds in B12012: Diff 32481.Jan 6 2021, 11:47 AM
Falk David (filedescriptor) added a reviewer: Antonio Vazquez (antoniov).Jan 6 2021, 11:48 AM
Falk David (filedescriptor) added a project: Grease Pencil.
Falk David (filedescriptor) added a subscriber: Antonio Vazquez (antoniov).
Falk David (filedescriptor) updated this revision to Diff 32482.Jan 6 2021, 11:52 AM
Falk David (filedescriptor) added a task: T84420: Linking Materials causes Regular Materials to be used in Grease Pencil.
  • Fix comment
Harbormaster completed remote builds in B12013: Diff 32482.Jan 6 2021, 11:53 AM
Philip Holzmann (Foaly) added a subscriber: Philip Holzmann (Foaly).Jan 6 2021, 2:19 PM
Philip Holzmann (Foaly) added inline comments.
source/blender/editors/object/object_relations.c
1574

I think using == would be more readable.

Falk David (filedescriptor) updated this revision to Diff 32486.Jan 6 2021, 2:35 PM
  • Write XNOR as equality
Falk David (filedescriptor) marked an inline comment as done.Jan 6 2021, 2:35 PM
Falk David (filedescriptor) added inline comments.
source/blender/editors/object/object_relations.c
1574

That is indeed cleaner, thank you!

Harbormaster completed remote builds in B12017: Diff 32486.Jan 6 2021, 2:40 PM
Antonio Vazquez (antoniov) added inline comments.Jan 6 2021, 3:43 PM
source/blender/editors/object/object_relations.c
1574

Why don't use?

((ob_src->type == OB_GPENCIL) && (ob_dst->type == OB_GPENCIL))

Antonio Vazquez (antoniov) added inline comments.Jan 6 2021, 3:44 PM
source/blender/editors/object/object_relations.c
1574

I see, the && does not work.

Antonio Vazquez (antoniov) accepted this revision.Jan 6 2021, 3:45 PM

Not totally sure you must include the text with the task, ask to someone else about that, but the fix LGTM.

This revision is now accepted and ready to land.Jan 6 2021, 3:45 PM
Falk David (filedescriptor) updated this revision to Diff 32494.Jan 6 2021, 5:53 PM
  • Fix comment
Harbormaster completed remote builds in B12023: Diff 32494.Jan 6 2021, 5:54 PM
Closed by commit rB5cdf279ef46f: Fix T84420: Linking regular materials to gpencil (authored by Falk David (filedescriptor)). · Explain WhyJan 6 2021, 5:55 PM
This revision was automatically updated to reflect the committed changes.
Falk David (filedescriptor) added a commit: rB5cdf279ef46f: Fix T84420: Linking regular materials to gpencil.

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
object/
6 lines

Diff 32486

View Options

source/blender/editors/object/object_relations.c

Loading...