Skip to content

Commit ca6170e

Browse files
authored
Merge pull request #1955 from alicevision/dev/removeBlender
[meshroom] Nodes: Remove `blender` module
2 parents 8a55d65 + 3fccc26 commit ca6170e

File tree

5 files changed

+10
-612
lines changed

5 files changed

+10
-612
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,22 @@ jobs:
136136
- name: Meshroom Plugin - Templates validity
137137
working-directory: ./functional_tests
138138
run: |
139+
# Clone and checkout mrSegmentation, align the branch if necessary
139140
git clone https://github.com/meshroomHub/mrSegmentation.git
140141
cd mrSegmentation
141142
mrSegmentation_avBranch=$(git ls-remote --heads https://github.com/meshroomHub/mrSegmentation.git $GITHUB_HEAD_REF | cut -f 1)
142143
if [ $mrSegmentation_avBranch != "" ]; then git checkout $mrSegmentation_avBranch; echo "Use mrSegmentation/$GITHUB_HEAD_REF"; fi
144+
cd ..
145+
146+
# Clone and checkout mrBlenderSfmRenderer, align the branch if necessary
147+
git clone https://github.com/meshroomHub/mrBlenderSfmRenderer.git
148+
cd mrBlenderSfmRenderer
149+
mrBlenderSfmRenderer_avBranch=$(git ls-remote --heads https://github.com/meshroomHub/mrBlenderSfmRenderer.git $GITHUB_HEAD_REF | cut -f 1)
150+
if [ $mrBlenderSfmRenderer_avBranch != "" ]; then git checkout $mrBlenderSfmRenderer_avBranch; echo "Use mrBlenderSfmRenderer/$GITHUB_HEAD_REF"; fi
143151
cd ../Meshroom/
152+
144153
export MESHROOM_INSTALL_DIR=$PWD
145-
export MESHROOM_NODES_PATH=${MESHROOM_NODES_PATH}:${ALICEVISION_ROOT}/share/meshroom:$PWD/../mrSegmentation/meshroom
154+
export MESHROOM_NODES_PATH=${MESHROOM_NODES_PATH}:${ALICEVISION_ROOT}/share/meshroom:$PWD/../mrSegmentation/meshroom:$PWD/../mrBlenderSfmRenderer/meshroom
146155
export MESHROOM_PIPELINE_TEMPLATES_PATH=${MESHROOM_PIPELINE_TEMPLATES_PATH}:${ALICEVISION_ROOT}/share/meshroom
147156
export PYTHONPATH=$PWD:${ALICEVISION_ROOT}/lib64/python:${ALICEVISION_ROOT}/lib/python:${PYTHONPATH}
148157
export PATH=$PATH:${ALICEVISION_ROOT}/bin

meshroom/blender/ScenePreview.py

Lines changed: 0 additions & 141 deletions
This file was deleted.

meshroom/blender/__init__.py

Whitespace-only changes.

meshroom/blender/scripts/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)