Patrick Mours
097a13f5be
Commit c8dd33f5a37b6a6db0b6950d24f9a7cff5ceb799 in OSL changed behavior of shader parameters that reference each other and are also overwritten with an instance value. This is causing the "NormalIn" parameter of a few OSL nodes in Cycles to be set to zero somehow, which should instead have received the value from a "node_geometry" node Cycles generates and connects automatically. I am not entirely sure why that is happening, but these parameters are superfluous anyway, since OSL already provides the necessary data in the global variable "N". So this patch simply removes those parameters (which mimics SVM, where these parameters do not exist either), which also fixes the rendering artifacts that occured with recent OSL. Maniphest Tasks: T101222 Differential Revision: https://developer.blender.org/D16470
58 lines
1.7 KiB
Plaintext
58 lines
1.7 KiB
Plaintext
/* SPDX-License-Identifier: Apache-2.0
|
|
* Copyright 2011-2022 Blender Foundation */
|
|
|
|
#include "stdcycles.h"
|
|
|
|
shader node_geometry(string bump_offset = "center",
|
|
|
|
output point Position = point(0.0, 0.0, 0.0),
|
|
output normal Normal = normal(0.0, 0.0, 0.0),
|
|
output normal Tangent = normal(0.0, 0.0, 0.0),
|
|
output normal TrueNormal = normal(0.0, 0.0, 0.0),
|
|
output vector Incoming = vector(0.0, 0.0, 0.0),
|
|
output point Parametric = point(0.0, 0.0, 0.0),
|
|
output float Backfacing = 0.0,
|
|
output float Pointiness = 0.0,
|
|
output float RandomPerIsland = 0.0)
|
|
{
|
|
Position = P;
|
|
Normal = N;
|
|
TrueNormal = Ng;
|
|
Incoming = I;
|
|
Parametric = point(1.0 - u - v, u, 0.0);
|
|
Backfacing = backfacing();
|
|
|
|
if (bump_offset == "dx") {
|
|
Position += Dx(Position);
|
|
Parametric += Dx(Parametric);
|
|
}
|
|
else if (bump_offset == "dy") {
|
|
Position += Dy(Position);
|
|
Parametric += Dy(Parametric);
|
|
}
|
|
|
|
/* first try to get tangent attribute */
|
|
point generated;
|
|
|
|
/* try to create spherical tangent from generated coordinates */
|
|
if (getattribute("geom:generated", generated)) {
|
|
normal data = normal(-(generated[1] - 0.5), (generated[0] - 0.5), 0.0);
|
|
vector T = transform("object", "world", data);
|
|
Tangent = cross(Normal, normalize(cross(T, Normal)));
|
|
}
|
|
else {
|
|
/* otherwise use surface derivatives */
|
|
Tangent = normalize(dPdu);
|
|
}
|
|
|
|
getattribute("geom:pointiness", Pointiness);
|
|
if (bump_offset == "dx") {
|
|
Pointiness += Dx(Pointiness);
|
|
}
|
|
else if (bump_offset == "dy") {
|
|
Pointiness += Dy(Pointiness);
|
|
}
|
|
|
|
getattribute("geom:random_per_island", RandomPerIsland);
|
|
}
|