Page MenuHome
Differential D744

Fix T41456: soft light texture blend mode zero effect
ClosedPublic
Actions

Authored by Kévin Dietrich (kevindietrich) on Aug 16 2014, 11:04 PM.

Details

Reviewers
Antonis Ryakiotakis (psy-fi)
Maniphest Tasks
T41456: soft light texture blend mode zero effect
Commits
rBSb07ea2fc15ac: Fix T41456: soft light texture blend mode zero effect
rBb07ea2fc15ac: Fix T41456: soft light texture blend mode zero effect
Summary

Soft light and Linear light blend modes weren't implemented in glsl

Diff Detail

Repository
rB Blender
Branch
fix_t41456

Event Timeline

Kévin Dietrich (kevindietrich) updated this revision to Diff 2444.Aug 16 2014, 11:04 PM
Kévin Dietrich (kevindietrich) retitled this revision from to Fix T41456: soft light texture blend mode zero effect.
Kévin Dietrich (kevindietrich) updated this object.
Kévin Dietrich (kevindietrich) added a reviewer: Antonis Ryakiotakis (psy-fi).
Kévin Dietrich (kevindietrich) added a task: T41456: soft light texture blend mode zero effect.Aug 16 2014, 11:05 PM
Antonis Ryakiotakis (psy-fi) edited edge metadata.Aug 17 2014, 1:03 PM

Generally patch LGTM,, with few minor nitpicks.

source/blender/gpu/shaders/gpu_shader_material.glsl
1022

spacing here and below in assignment

1031

spacing in all assignments in this function

Kévin Dietrich (kevindietrich) added a comment.Aug 17 2014, 1:27 PM

I essentially copied the code from other functions higher in the same file, and didn't change the code style. Will also remove a comment in DNA_texture_types.h stating that MTEX_SOFT_LIGHT and MTEX_LIN_LIGHT flags are "free for use" as they are used now :)

Kévin Dietrich (kevindietrich) updated this revision to Diff 2448.Aug 17 2014, 1:31 PM
Kévin Dietrich (kevindietrich) edited edge metadata.
  • Spaces arround assignemts and remove outdated comment
  • Remove unused variable
Antonis Ryakiotakis (psy-fi) closed this revision.Aug 18 2014, 7:15 PM
Antonis Ryakiotakis (psy-fi) updated this revision to Diff 2454.

Closed by commit rBb07ea2fc15ac (authored by @Antonis Ryakiotakis (psy-fi)).

Antonis Ryakiotakis (psy-fi) added a comment.Aug 18 2014, 7:20 PM

Thanks for the patch, commited.

The crappy thing is that I did it with arc and it changed the commiter name to mine...Thankfully the link still points to that Diff revision so at least it's possible to see who wrote it here. I'll try to remember to apply it manually or amend the commit next time to keep the name of the patch writer intact.

Revision Contents
Changeset List

PathSize
source/
blender/
gpu/
intern/
6 lines
shaders/
32 lines
makesdna/
1 line

Diff 2448

View Options

source/blender/gpu/intern/gpu_material.c

Loading...
View Options

source/blender/gpu/shaders/gpu_shader_material.glsl

Loading...
View Options

source/blender/makesdna/DNA_texture_types.h

Loading...