Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-20 15:20:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-20 15:20:24 +0300
commitde4dcda545e80a09fdc4ad61091eb303e4a22e6f (patch)
tree1003c32dbc626147fbba37c815698d57530060f0 /intern/cycles/kernel/shaders
parent51b0ae8a85dbb47963f24fe3d79de878092cc6cc (diff)
Fix T43651: New pointiness attribute doesn't work with displacement
Simple fix: just make pointiness aware of bump offset.
Diffstat (limited to 'intern/cycles/kernel/shaders')
-rw-r--r--intern/cycles/kernel/shaders/node_geometry.osl6
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_geometry.osl b/intern/cycles/kernel/shaders/node_geometry.osl
index 2bbaaff2133..b0bd7692489 100644
--- a/intern/cycles/kernel/shaders/node_geometry.osl
+++ b/intern/cycles/kernel/shaders/node_geometry.osl
@@ -60,5 +60,11 @@ shader node_geometry(
}
getattribute("geom:pointiness", Pointiness);
+ if (bump_offset == "dx") {
+ Pointiness += Dx(Pointiness);
+ }
+ else if (bump_offset == "dy") {
+ Pointiness += Dy(Pointiness);
+ }
}