Skip to content

Commit 4edaa21

Browse files
committed
fix: macos
1 parent 8ed643f commit 4edaa21

3 files changed

Lines changed: 10 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v5
60+
uses: actions/checkout@v6
6161
with:
6262
# workflow_call: optional ref; push/dispatch: never read inputs (undefined outside workflow_call)
6363
ref: ${{ github.event_name == 'workflow_call' && (inputs.ref != '' && inputs.ref || github.ref) || github.ref }}
@@ -98,7 +98,7 @@ jobs:
9898
run: cmake --build --preset "${{ matrix.build_preset }}"
9999

100100
- name: Upload plugin output
101-
uses: actions/upload-artifact@v5
101+
uses: actions/upload-artifact@v7
102102
with:
103103
name: build-${{ runner.os }}-${{ matrix.sdk }}
104104
path: _build_msvc/${{ matrix.sdk }}/bin/Release/plugins/mmdtool/

.github/workflows/package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
shell: bash
3232
steps:
3333
- name: Checkout (resources for installer)
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
ref: ${{ github.ref }}
3737
submodules: recursive
@@ -83,7 +83,7 @@ jobs:
8383
"${{ github.workspace }}/setup/Common/installer_script.iss"
8484

8585
- name: Upload installer artifact
86-
uses: actions/upload-artifact@v5
86+
uses: actions/upload-artifact@v7
8787
with:
8888
name: windows-installer
8989
path: setup/Common/Output/*.exe
@@ -97,13 +97,13 @@ jobs:
9797
shell: bash
9898
steps:
9999
- name: Checkout (res/)
100-
uses: actions/checkout@v5
100+
uses: actions/checkout@v6
101101
with:
102102
ref: ${{ github.ref }}
103103
submodules: recursive
104104

105105
- name: Download macOS build artifacts
106-
uses: actions/download-artifact@v5
106+
uses: actions/download-artifact@v8
107107
with:
108108
pattern: build-macOS-*
109109
path: ${{ github.workspace }}/_dl
@@ -131,7 +131,7 @@ jobs:
131131
done
132132

133133
- name: Upload macOS zip artifacts
134-
uses: actions/upload-artifact@v5
134+
uses: actions/upload-artifact@v7
135135
with:
136136
name: macos-zips
137137
path: dist/*.zip
@@ -142,13 +142,13 @@ jobs:
142142
runs-on: ubuntu-latest
143143
steps:
144144
- name: Download installer
145-
uses: actions/download-artifact@v5
145+
uses: actions/download-artifact@v8
146146
with:
147147
name: windows-installer
148148
path: ${{ github.workspace }}/assets
149149

150150
- name: Download macOS zips
151-
uses: actions/download-artifact@v5
151+
uses: actions/download-artifact@v8
152152
with:
153153
name: macos-zips
154154
path: ${{ github.workspace }}/assets

source/module/tools/material/mmd_redshift_material.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
#include <c4d_symbols.h>
33
#include "module/core/cmt_marco.h"
44

5-
namespace
6-
{
7-
constexpr auto ID_REDSHIFT_MATERIAL = 1036224;
8-
}
9-
105
#if API_VERSION >= 2024000
116
#include "maxon/graph.h"
127
#include "maxon/graph_helper.h"
138
#include "maxon/nodesgraph.h"
149

1510
namespace
1611
{
12+
constexpr auto ID_REDSHIFT_MATERIAL = 1036224;
1713
constexpr maxon::LiteralId g_redshiftId("com.redshift3d.redshift4c4d.class.nodespace");
1814
const maxon::Id k_standardMaterialAssetId("com.redshift3d.redshift4c4d.nodes.core.standardmaterial");
1915
const maxon::Id k_textureSamplerAssetId("com.redshift3d.redshift4c4d.nodes.core.texturesampler");

0 commit comments

Comments
 (0)