Skip to content

Commit 2ae3121

Browse files
Fix OSL definitions of matrix extract (#2849)
This changelist fixes a function overload error in the OSL definitions of the matrix extract nodes. Fixes #2845.
1 parent f85fa6b commit 2ae3121

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

libraries/stdlib/genosl/include/mx_funcs.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@ float mx_extract(vector4 in, int index)
132132
else return in.w;
133133
}
134134

135-
vector mx_extract(matrix33 in, int index)
135+
vector mx_extract_matrix33(matrix in, int index)
136136
{
137-
if (index == 0) return vector(in.m[0][0], in.m[0][1], in.m[0][2]);
138-
else if (index == 1) return vector(in.m[1][0], in.m[1][1], in.m[1][2]);
139-
else return vector(in.m[2][0], in.m[2][1], in.m[2][2]);
137+
if (index == 0) return vector(in[0][0], in[0][1], in[0][2]);
138+
else if (index == 1) return vector(in[1][0], in[1][1], in[1][2]);
139+
else return vector(in[2][0], in[2][1], in[2][2]);
140140
}
141141

142-
vector4 mx_extract(matrix in, int index)
142+
vector4 mx_extract_matrix44(matrix in, int index)
143143
{
144144
if (index == 0) return vector4(in[0][0], in[0][1], in[0][2], in[0][3]);
145145
else if (index == 1) return vector4(in[1][0], in[1][1], in[1][2], in[1][3]);

libraries/stdlib/genosl/stdlib_genosl_impl.mtlx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,8 @@
755755
<implementation name="IM_extract_vector2_genosl" nodedef="ND_extract_vector2" sourcecode="mx_extract({{in}}, {{index}})" target="genosl" />
756756
<implementation name="IM_extract_vector3_genosl" nodedef="ND_extract_vector3" sourcecode="mx_extract({{in}}, {{index}})" target="genosl" />
757757
<implementation name="IM_extract_vector4_genosl" nodedef="ND_extract_vector4" sourcecode="mx_extract({{in}}, {{index}})" target="genosl" />
758-
<implementation name="IM_extract_matrix33_genosl" nodedef="ND_extract_matrix33" sourcecode="mx_extract({{in}}, {{index}})" target="genosl" />
759-
<implementation name="IM_extract_matrix44_genosl" nodedef="ND_extract_matrix44" sourcecode="mx_extract({{in}}, {{index}})" target="genosl" />
758+
<implementation name="IM_extract_matrix33_genosl" nodedef="ND_extract_matrix33" sourcecode="mx_extract_matrix33({{in}}, {{index}})" target="genosl" />
759+
<implementation name="IM_extract_matrix44_genosl" nodedef="ND_extract_matrix44" sourcecode="mx_extract_matrix44({{in}}, {{index}})" target="genosl" />
760760

761761
<!-- ======================================================================== -->
762762
<!-- Convolution nodes -->

0 commit comments

Comments
 (0)