Skip to content

Commit 2107d0b

Browse files
authored
Merge pull request #1056 from LuxCoreRender/for_v2.11
For v2.11.0-a.1
2 parents 6cdd54e + 60a5d0a commit 2107d0b

159 files changed

Lines changed: 6518 additions & 3106 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_bundle.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-FileCopyrightText: 2025 Howetuft, Johannes Hinrichs (CodeFHD)
22
#
3-
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
name: BlendLuxCore Build Bundle
66

@@ -67,4 +67,8 @@ jobs:
6767
uses: actions/upload-artifact@v4
6868
with:
6969
name: "BlendLuxCore"
70+
<<<<<<< HEAD
71+
path: "${{ github.workspace }}/build/out/BlendLuxCore-*.zip"
72+
=======
7073
path: "${{ github.workspace }}/build/BlendLuxCore-*.zip"
74+
>>>>>>> 9c294874 (Build bundle workflow: add worflow_dispatch)

.github/workflows/bundle_latest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-FileCopyrightText: 2025 Howetuft, Johannes Hinrichs (CodeFHD)
22
#
3-
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
name: BlendLuxCore Create Latest Release
66

@@ -39,6 +39,7 @@ jobs:
3939
- name: Delete old latest release
4040
shell: bash
4141
run: |
42+
echo "Delete old latest release"
4243
echo false > ${{ github.workspace }}/tmp_release_test
4344
gh release list --json name > ${{ github.workspace }}/tmp_releases
4445
jq -r -c .[].name ${{ github.workspace }}/tmp_releases | while read i; do

.github/workflows/bundle_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2024 Howetuft
1+
# SPDX-FileCopyrightText: 2025 Howetuft
22
#
3-
# SPDX-License-Identifier: Apache-2.0
3+
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
name: BlendLuxCore Create Release
66

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,12 @@ out/
1515
.vscode/
1616

1717
# blendev utility script, exclude custom local config
18-
debug-helpers/blendev/blendev-config.txt
18+
debug-helpers/blendev/blendev-config.txt
19+
debug-helpers/blendev/blendev-config.cfg
20+
21+
# CMake files
22+
CMakeCache.txt
23+
CMakeFiles/
24+
Makefile
25+
cmake_install.cmake
26+
install_manifest.txt

AUTHORS.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Authors:
2+
3+
Simon "B.Y.O.B." Wendsche <>
4+
Michael "neo2068" Klemm <>
5+
Johannes "CodeHD" Hinrichs <joho.hini.at.gmail.com>
6+
Howetuft <howetuft.at.gmail.com>
7+
Odilkhan "odil24" Yakubov <>
8+
acasta69 <>
9+
u3dreal <>
10+
Philstix <>
11+
12+
Complete list available at https://github.com/LuxCoreRender/BlendLuxCore/graphs/contributors

CMakeLists.txt

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# To build extension:
2-
# Get out of the tree, for instance in ..
3-
# cmake -B blc-build -S BlendLuxCore && cmake --build blc-build
2+
# cmake . && cmake --build .
43

54
cmake_minimum_required(VERSION 3.25)
65

7-
set(CMAKE_DISABLE_SOURCE_CHANGES ON)
8-
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
96
if(NOT CMAKE_BUILD_TYPE)
107
set(CMAKE_BUILD_TYPE "Release")
118
endif()
129

1310
project(BlendLuxCore LANGUAGES NONE)
14-
if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
15-
message(SEND_ERROR "In-source builds are not allowed.")
16-
endif()
11+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out)
12+
13+
# Create output directory (otherwise Blender complains)
14+
file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
15+
1716

1817
function(validate_blender_version result blender)
1918
execute_process(
@@ -53,10 +52,23 @@ endif()
5352
find_program(BLENDER blender NAMES blender.exe VALIDATOR validate_blender_version NO_CACHE REQUIRED)
5453

5554
# Add BlendLuxCore target
55+
# https://docs.blender.org/manual/en/latest/advanced/command_line/extension_arguments.html
5656
add_custom_target(
5757
extension ALL ${BLENDER}
5858
--command extension build
5959
--source-dir ${CMAKE_CURRENT_SOURCE_DIR}
60-
--output-filepath ${CMAKE_CURRENT_BINARY_DIR}/BlendLuxCore-${BLC_VERSION}.zip
60+
--output-filepath ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlendLuxCore-${BLC_VERSION}.zip
6161
VERBATIM
6262
)
63+
64+
# Add install
65+
# cmake --install .
66+
install(CODE "
67+
execute_process(
68+
COMMAND ${BLENDER} --command extension install-file -r blender_org ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlendLuxCore-${BLC_VERSION}.zip
69+
OUTPUT_VARIABLE INSTALL_OUTPUT
70+
ERROR_VARIABLE INSTALL_OUTPUT
71+
)
72+
message(STATUS \"Blender output: \${INSTALL_OUTPUT}\")
73+
74+
")

0 commit comments

Comments
 (0)