blender/blender
166
522
Fork 797
Code Issues 6.8k Pull Requests 949 Projects 21 Wiki Activity

WIP: Shader: Add Artistic Conductor Fresnel type to Metallic BSDF #126871

Draft
Alaska wants to merge 3 commits from Alaska/blender:add-artisitc-conductor into main
pull from: Alaska/blender:add-artisitc-conductor
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 3 Files Changed 11 +2 -2
1 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 eca0479b3d - Show all commits

4
intern/cycles/scene/shader_nodes.cpp
View File

@ -2460,9 +2460,9 @@ NODE_DEFINE(MetallicBsdfNode)
static NodeEnum fresnel_type_enum;
fresnel_type_enum.insert("f82", CLOSURE_BSDF_F82_CONDUCTOR);
fresnel_type_enum.insert("artist_conductor", CLOSURE_BSDF_ARTISTIC_CONDUCTOR);
fresnel_type_enum.insert("physical_conductor", CLOSURE_BSDF_PHYSICAL_CONDUCTOR);
SOCKET_ENUM(fresnel_type, "fresnel_type", fresnel_type_enum, CLOSURE_BSDF_ARTISTIC_CONDUCTOR);
fresnel_type_enum.insert("artist_conductor", CLOSURE_BSDF_ARTISTIC_CONDUCTOR);
SOCKET_ENUM(fresnel_type, "fresnel_type", fresnel_type_enum, CLOSURE_BSDF_F82_CONDUCTOR);
SOCKET_IN_COLOR(edge_tint, "Edge Tint", make_float3(0.695f, 0.726f, 0.770f));