griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Cycles: mix weight not applied on volume emission with SVM

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/138081
This commit is contained in:
Weizhen Huang
2025-04-28 12:29:38 +02:00
committed by Weizhen Huang
parent 132b93ece9
commit 9cc252088e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/svm/closure.h
View File

@@ -1196,10 +1196,11 @@ ccl_device_noinline int svm_node_principled_volume(KernelGlobals kg,
}
/* Compute density. */
const float weight = mix_weight * object_volume_density(kg, sd->object);
float primitive_density = 1.0f;
float density = (stack_valid(density_offset)) ? stack_load_float(stack, density_offset) :
__uint_as_float(value_node.x);
density = mix_weight * fmaxf(density, 0.0f) * object_volume_density(kg, sd->object);
density = weight * fmaxf(density, 0.0f);
if (density > 0.0f) {
/* Density and color attribute lookup if available. */
@@ -1262,8 +1263,7 @@ ccl_device_noinline int svm_node_principled_volume(KernelGlobals kg,
if (emission > 0.0f) {
const float3 emission_color = stack_load_float3(stack, emission_color_offset);
emission_setup(
sd, rgb_to_spectrum(emission * emission_color * object_volume_density(kg, sd->object)));
emission_setup(sd, rgb_to_spectrum(emission * emission_color * weight));
}
if (blackbody > 0.0f) {
@@ -1287,7 +1287,7 @@ ccl_device_noinline int svm_node_principled_volume(KernelGlobals kg,
const float3 blackbody_tint = stack_load_float3(stack, node.w);
const float3 bb = blackbody_tint * intensity *
rec709_to_rgb(kg, svm_math_blackbody_color_rec709(T));
emission_setup(sd, rgb_to_spectrum(bb * object_volume_density(kg, sd->object)));
emission_setup(sd, rgb_to_spectrum(bb * weight));
}
}
#endif

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

@@ -3226,6 +3226,7 @@ NODE_DEFINE(EmissionNode)
SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
SOCKET_IN_FLOAT(strength, "Strength", 10.0f);
SOCKET_IN_FLOAT(surface_mix_weight, "SurfaceMixWeight", 0.0f, SocketType::SVM_INTERNAL);
SOCKET_IN_FLOAT(volume_mix_weight, "VolumeMixWeight", 0.0f, SocketType::SVM_INTERNAL);
SOCKET_OUT_CLOSURE(emission, "Emission");

1
intern/cycles/scene/shader_nodes.h
View File

@@ -738,6 +738,7 @@ class EmissionNode : public ShaderNode {
NODE_SOCKET_API(float3, color)
NODE_SOCKET_API(float, strength)
NODE_SOCKET_API(float, surface_mix_weight)
NODE_SOCKET_API(float, volume_mix_weight)
bool from_auto_conversion = false;
};