Skip to content

Commit

Permalink
Merge branch 'main' into tdw46-vrma-non-humanoid-2
Browse files Browse the repository at this point in the history
  • Loading branch information
tdw46 committed Feb 17, 2025
2 parents 1fb83f6 + 899cf19 commit 39b4719
Show file tree
Hide file tree
Showing 43 changed files with 483 additions and 396 deletions.
16 changes: 16 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN dnf update -y \
file \
gh \
git \
git-lfs \
less \
libSM \
libXi \
Expand All @@ -40,6 +41,8 @@ RUN dnf update -y \
&& if [ "$(uname -m)" != "x86_64" ]; then \
dnf install-n -y --setopt=install_weak_deps=False --allowerasing \
OpenImageIO-devel \
automake \
autoconf \
bison \
boost-devel \
bzip2-devel \
Expand All @@ -63,6 +66,7 @@ RUN dnf update -y \
libepoxy-devel \
libffi-devel \
libjpeg-turbo-devel \
libtool \
libxkbcommon-devel \
libxml2-devel \
libzstd-devel \
Expand Down Expand Up @@ -138,6 +142,18 @@ RUN if [ "$(uname -m)" != "x86_64" ]; then \
&& popd \
&& rm -fr embree \
; fi
RUN if [ "$(uname -m)" != "x86_64" ]; then \
curl --fail --show-error --location --output OpenSubdiv.tar.gz https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_6_0.tar.gz \
&& test "$(md5sum OpenSubdiv.tar.gz)" = "cd03aaf8890bc0b8550eef62029cabe7 OpenSubdiv.tar.gz" \
&& mkdir -p OpenSubdiv \
&& pushd OpenSubdiv \
&& tar zxf ../OpenSubdiv.tar.gz --strip-components=1 \
&& cmake . \
&& make \
&& make install \
&& popd \
&& rm -fr OpenSubdiv \
; fi
# ceresのビルド中にビルドが失敗することがある。失敗した場合はNPROCS=1を付与することで解決した。
# 発生していたエラーは次のとおり:
# [ 66%] Building C object source/blender/editors/animation/CMakeFiles/bf_editor_animation.dir/anim_channels_edit.c.o
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"cesium.gltf-vscode",
"charliermarsh.ruff",
"ms-azuretools.vscode-docker",
"ms-python.mypy-type-checker",
"ms-python.python",
"ms-python.vscode-pylance",
"ms-vscode.powershell"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ jobs:
VALIDATE_JSCPD: false
VALIDATE_PYTHON_BLACK: false
VALIDATE_PYTHON_ISORT: false
VALIDATE_PYTHON_MYPY: false
VALIDATE_PYTHON_PYINK: false
VALIDATE_PYTHON_PYLINT: false
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.13.0
22.14.0
2 changes: 1 addition & 1 deletion docs/website/config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ colorScheme = "congo"
defaultAppearance = "dark"
autoSwitchAppearance = false
showAppearanceSwitcher = false
copyright = "© 2022 - 2023 saturday06"
copyright = "© 2022 - 2025 saturday06"

# header.logo = "images/logo.png" # https://openclipart.org/detail/277988/gear-icons
mainSections = ["section1", "section2"]
Expand Down
Loading

0 comments on commit 39b4719

Please sign in to comment.