diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx index ec4af76961..51566463aa 100644 --- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx +++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx @@ -686,7 +686,7 @@ - + diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl index 8cfedd56a0..601a10fda2 100644 --- a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl +++ b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_6.mdl @@ -4437,3 +4437,9 @@ export float3 mx_worleynoise3d_float3( { return noise::mx_worley_noise_float3(mxp_position, mxp_jitter, 0); } + +export core::color4 mx_combine2_color4CF(color in1, float in2) +{ + float3 in1_as_float3 = float3(in1); + return core::mk_color4(in1_as_float3.x, in1_as_float3.y, in1_as_float3.z, in2); +} diff --git a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl index b6e7174114..bef1e430d4 100644 --- a/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl +++ b/source/MaterialXGenMdl/mdl/materialx/stdlib_1_8.mdl @@ -321,6 +321,7 @@ export using .::stdlib_1_7 import mx_worleynoise2d_float3; export using .::stdlib_1_7 import mx_worleynoise3d_float; export using .::stdlib_1_7 import mx_worleynoise3d_float2; export using .::stdlib_1_7 import mx_worleynoise3d_float3; +export using .::stdlib_1_7 import mx_combine2_color4CF; // NOTE: Not planned to be implemented. export using .::stdlib_1_7 import mx_geompropvalue_string;