Page MenuHome
Differential D10957

Fix T87406: Stroke color when using object color mode
ClosedPublic
Actions

Authored by Falk David (filedescriptor) on Apr 12 2021, 4:50 PM.

Details

Reviewers
Antonio Vazquez (antoniov)
Clément Foucault (fclem)
Maniphest Tasks
T87406: Grease pencil. Stroke color do not match to object`s color
Commits
rB7c18fb062d36: Fix T87406: Stroke color when using object color mode
Summary

The color of the strokes was shifted when using Single Color or
Object Colorin Solid Display Mode. This was originally done so
that it was still possible to differentiate strokes and fills.

The fix allows for a completly flat shading by checking if the
Lighting Mode is set to Flat. If it is, then the colors are not
shifted for the strokes and everything will use the same color.

Diff Detail

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

Event Timeline

Falk David (filedescriptor) requested review of this revision.Apr 12 2021, 4:50 PM
Falk David (filedescriptor) created this revision.
Harbormaster completed remote builds in B14011: Diff 36087.Apr 12 2021, 4:50 PM
Vyacheslav (hitrpr) awarded a token.Apr 12 2021, 4:54 PM
Vyacheslav (hitrpr) rescinded a token.Apr 12 2021, 5:00 PM
Vyacheslav (hitrpr) awarded a token.
Falk David (filedescriptor) planned changes to this revision.Apr 12 2021, 5:11 PM
Falk David (filedescriptor) updated this revision to Diff 36090.Apr 12 2021, 5:15 PM
  • Add null check to v3d
Harbormaster completed remote builds in B14013: Diff 36090.Apr 12 2021, 5:15 PM
Antonio Vazquez (antoniov) added inline comments.Apr 12 2021, 5:16 PM
source/blender/draw/engines/gpencil/gpencil_draw_data.c
206

Better use the light mode instead of 1, no?

Falk David (filedescriptor) updated this revision to Diff 36092.EditedApr 12 2021, 5:18 PM
  • Use enum value instead of constant
Harbormaster completed remote builds in B14015: Diff 36092.Apr 12 2021, 5:18 PM
Antonio Vazquez (antoniov) accepted this revision.Apr 12 2021, 5:21 PM

LGTM (Daniel and Matias also agree with this change)

This revision is now accepted and ready to land.Apr 12 2021, 5:21 PM
Clément Foucault (fclem) requested changes to this revision.Apr 12 2021, 7:28 PM
Clément Foucault (fclem) added inline comments.
source/blender/draw/engines/gpencil/gpencil_draw_data.c
112

Use eV3DShadingLightingMode instead of char.

This revision now requires changes to proceed.Apr 12 2021, 7:28 PM
Falk David (filedescriptor) updated this revision to Diff 36100.Apr 12 2021, 7:55 PM
  • Use eV3DShadingLightingMode
Harbormaster completed remote builds in B14016: Diff 36100.Apr 12 2021, 7:55 PM
Clément Foucault (fclem) accepted this revision.Apr 12 2021, 8:02 PM
This revision is now accepted and ready to land.Apr 12 2021, 8:02 PM
Closed by commit rB7c18fb062d36: Fix T87406: Stroke color when using object color mode (authored by Falk David (filedescriptor), committed by Antonio Vazquez (antoniov)). · Explain WhyApr 14 2021, 7:00 PM
This revision was automatically updated to reflect the committed changes.
Antonio Vazquez (antoniov) added a commit: rB7c18fb062d36: Fix T87406: Stroke color when using object color mode.

Revision Contents
Changeset List

PathSize
source/
blender/
draw/
engines/
gpencil/
14 lines

Diff 36087

View Options

source/blender/draw/engines/gpencil/gpencil_draw_data.c

Loading...