Skip to content

Commit ad6a840

Browse files
Merge branch 'main' into add_udim_test
2 parents 1bdb47f + 47a6332 commit ad6a840

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ jobs:
391391
strategy:
392392
fail-fast: false
393393
matrix:
394-
python-minor: ['9', '10', '11', '12']
394+
python-minor: ['9', '10', '11', '12', '13']
395395
os: ['ubuntu-24.04', 'windows-2022', 'macos-15']
396396

397397
steps:
@@ -415,20 +415,17 @@ jobs:
415415
path: sdist
416416

417417
- name: Build Wheel
418-
uses: pypa/cibuildwheel@v2.19.2
418+
uses: pypa/cibuildwheel@v2.23.2
419419
with:
420420
package-dir: ${{ github.workspace }}/sdist/${{ needs.sdist.outputs.sdist_filename }}
421421
env:
422422
CIBW_BUILD: 'cp3${{ matrix.python-minor }}-*'
423423
CIBW_SKIP: '*musllinux*'
424424
CIBW_ARCHS: 'auto64'
425-
# https://github.com/pypa/manylinux
426-
# manylinux2014 is CentOS 7 based. Which means GCC 10 and glibc 2.17.
427-
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
425+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
428426
CIBW_BEFORE_ALL_LINUX: yum install -y libXt-devel
429427
CIBW_BUILD_VERBOSITY: 1
430428
CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=2
431-
# CIBW_BUILD_FRONTEND: build # https://github.com/pypa/build
432429
MACOSX_DEPLOYMENT_TARGET: '11.0'
433430

434431
- name: Install Wheel

libraries/pbrlib/genglsl/mx_multiply_bsdf_color3.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ void mx_multiply_bsdf_color3(ClosureData closureData, BSDF in1, vec3 in2, out BS
44
{
55
vec3 tint = clamp(in2, 0.0, 1.0);
66
result.response = in1.response * tint;
7-
result.throughput = in1.throughput * tint;
7+
result.throughput = in1.throughput;
88
}

libraries/pbrlib/genglsl/mx_multiply_bsdf_float.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ void mx_multiply_bsdf_float(ClosureData closureData, BSDF in1, float in2, out BS
44
{
55
float weight = clamp(in2, 0.0, 1.0);
66
result.response = in1.response * weight;
7-
result.throughput = in1.throughput * weight;
7+
result.throughput = in1.throughput;
88
}

libraries/stdlib/stdlib_ng.mtlx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,6 +2173,10 @@
21732173
<input name="in1" type="vector2" interfacename="texcoord" />
21742174
<input name="in2" type="vector2" interfacename="texcoord" />
21752175
</add>
2176+
<add name="center_double" type="vector2">
2177+
<input name="in1" type="vector2" interfacename="center" />
2178+
<input name="in2" type="vector2" interfacename="center" />
2179+
</add>
21762180
<add name="sample_add" type="vector2">
21772181
<input name="in1" type="vector2" nodename="sample_double" />
21782182
<input name="in2" type="float" interfacename="radius" />
@@ -2208,22 +2212,22 @@
22082212
</combine2>
22092213
<circle name="circle1" type="float">
22102214
<input name="texcoord" type="vector2" nodename="coord1" />
2211-
<input name="center" type="vector2" interfacename="center" />
2215+
<input name="center" type="vector2" nodename="center_double" />
22122216
<input name="radius" type="float" interfacename="radius" />
22132217
</circle>
22142218
<circle name="circle2" type="float">
22152219
<input name="texcoord" type="vector2" nodename="coord2" />
2216-
<input name="center" type="vector2" interfacename="center" />
2220+
<input name="center" type="vector2" nodename="center_double" />
22172221
<input name="radius" type="float" interfacename="radius" />
22182222
</circle>
22192223
<circle name="circle3" type="float">
22202224
<input name="texcoord" type="vector2" nodename="coord3" />
2221-
<input name="center" type="vector2" interfacename="center" />
2225+
<input name="center" type="vector2" nodename="center_double" />
22222226
<input name="radius" type="float" interfacename="radius" />
22232227
</circle>
22242228
<circle name="circle4" type="float">
22252229
<input name="texcoord" type="vector2" nodename="coord4" />
2226-
<input name="center" type="vector2" interfacename="center" />
2230+
<input name="center" type="vector2" nodename="center_double" />
22272231
<input name="radius" type="float" interfacename="radius" />
22282232
</circle>
22292233
<max name="max1" type="float">

0 commit comments

Comments
 (0)