Page MenuHome
Differential D6058

Fix T70605: incorrect darken and lighten rgb mix mode
ClosedPublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Oct 14 2019, 4:11 PM.

Details

Reviewers
Brecht Van Lommel (brecht)
Clément Foucault (fclem)
Maniphest Tasks
T70605: EEVEE: color mix node set to "darken" wont work anymore with fac < 1
Commits
rC04b93ebff0e4: Fix T70605: incorrect darken and lighten rgb mix mode
rB2a9b162d9457: Fix T70605: incorrect darken and lighten rgb mix mode
Summary

This can go into the release branch, right?

Diff Detail

Repository
rB Blender
Branch
mix-rgb-dark-light (branched from master)
Build Status
Buildable 5354
Build 5354: arc lint + arc unit

Event Timeline

Jacques Lucke (JacquesLucke) created this revision.Oct 14 2019, 4:11 PM
Harbormaster completed remote builds in B5353: Diff 18995.Oct 14 2019, 4:11 PM
Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Oct 14 2019, 4:12 PM
Jacques Lucke (JacquesLucke) added a task: T70605: EEVEE: color mix node set to "darken" wont work anymore with fac < 1.Oct 14 2019, 4:16 PM
Brecht Van Lommel (brecht) accepted this revision.Oct 14 2019, 4:26 PM

Can you fix node_mix.osl as well?

This revision is now accepted and ready to land.Oct 14 2019, 4:26 PM
Brecht Van Lommel (brecht) requested changes to this revision.Oct 14 2019, 4:26 PM
This revision now requires changes to proceed.Oct 14 2019, 4:26 PM
Jacques Lucke (JacquesLucke) updated this revision to Diff 18996.Oct 14 2019, 4:37 PM
  • fix for osl
Harbormaster completed remote builds in B5354: Diff 18996.Oct 14 2019, 4:37 PM
Jacques Lucke (JacquesLucke) added a comment.EditedOct 14 2019, 4:40 PM

Hmm, MixLightenOperation::executePixelSampled also seems to be doing the same that the old mix_light was doing...

I guess this should be fixed as well then?
https://dunnbypaul.net/blends/

Dalai Felinto (dfelinto) added a subscriber: Dalai Felinto (dfelinto).Oct 15 2019, 4:35 AM

@Jacques Lucke (JacquesLucke) do one thing at a time. If the patch as it is fixes the reported issue, leave MixLightenOperation to be tackled separated.

@Clément Foucault (fclem) can you give this patch a +1?

Clément Foucault (fclem) accepted this revision.Oct 15 2019, 12:52 PM
This revision was not accepted when it landed; it landed in state Needs Review.Oct 15 2019, 5:37 PM
Closed by commit rB2a9b162d9457: Fix T70605: incorrect darken and lighten rgb mix mode (authored by Jacques Lucke (JacquesLucke)). · Explain Why
This revision was automatically updated to reflect the committed changes.
Jacques Lucke (JacquesLucke) added a commit: rB2a9b162d9457: Fix T70605: incorrect darken and lighten rgb mix mode.
Nathan Letwory (jesterking) added a commit: rC04b93ebff0e4: Fix T70605: incorrect darken and lighten rgb mix mode.Jan 13 2020, 11:27 PM

Revision Contents
Changeset List

PathSize
intern/
cycles/
kernel/
shaders/
4 lines
svm/
4 lines
source/
blender/
gpu/
shaders/
material/
4 lines

Diff 18996

View Options

intern/cycles/kernel/shaders/node_mix.osl

Loading...
View Options

intern/cycles/kernel/svm/svm_color_util.h

Loading...
View Options

source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl

Loading...