LukasTonne/blender
0
2
Fork 1
forked from blender/blender
Code Pull Requests Activity

Node panels: Enable new node group interfaces #1

Closed
Lukas Tönne wants to merge 14 commits from node-panels-final into node-panels-rna
pull from: node-panels-final
merge into: LukasTonne:node-panels-rna

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 14 Files Changed 85 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f65080ab4 - Show all commits

2
intern/cycles/kernel/svm/displace.h
View File

@ -165,7 +165,7 @@ ccl_device_noinline int svm_node_vector_displacement(
tangent = normalize(sd->dPdu); tangent = normalize(sd->dPdu);
} }
float3 bitangent = normalize(cross(normal, tangent)); float3 bitangent = safe_normalize(cross(normal, tangent));
const AttributeDescriptor attr_sign = find_attribute(kg, sd, node.w); const AttributeDescriptor attr_sign = find_attribute(kg, sd, node.w);
if (attr_sign.offset != ATTR_STD_NOT_FOUND) { if (attr_sign.offset != ATTR_STD_NOT_FOUND) {
float sign = primitive_surface_attribute_float(kg, sd, attr_sign, NULL, NULL); float sign = primitive_surface_attribute_float(kg, sd, attr_sign, NULL, NULL);

2
source/blender/gpu/shaders/material/gpu_shader_material_vector_displacement.glsl
View File

@ -3,7 +3,7 @@ void node_vector_displacement_tangent(
{ {
vec3 oN = normalize(normal_world_to_object(g_data.N)); vec3 oN = normalize(normal_world_to_object(g_data.N));
vec3 oT = normalize(normal_world_to_object(T.xyz)); vec3 oT = normalize(normal_world_to_object(T.xyz));
vec3 oB = T.w * normalize(cross(oN, oT)); vec3 oB = T.w * safe_normalize(cross(oN, oT));
result = (vector.xyz - midlevel) * scale; result = (vector.xyz - midlevel) * scale;
result = result.x * oT + result.y * oN + result.z * oB; result = result.x * oT + result.y * oN + result.z * oB;