Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-11 17:55:14 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-11 18:02:13 +0300
commitd3c4248946f65d287f18b3d6488cd450dfb6d81d (patch)
tree47ed70266631c5e40cf221031d84315d85f27983 /source/creator
parent68b736ce248fbfc6eacfa2fed4f677523087accb (diff)
Workbench: StudioLight HDRI's
The Studio lights are now loaded from disk. The location is `datafiles/studiolights` they need to be JPG for now. JPG cannot store HDRI color range but they are clamped inside the Workbench engine for speed reason. I didn't select JP2K as it might not be enabled. Users can add upto 20 HDRI files. This limitation is inside the RNA_space.c Currently the icons are calculated when you first open the selection box for the HDRI's. We could add them to a background rendering later. I added 2 test files a sky texture rendered in Cycles and an HDRI from cloud.blender.org.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 585a2f58204..8240b27f2cf 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -413,6 +413,7 @@ install(
DESTINATION ${TARGETDIR_VER}/datafiles
)
+
# helpful tip when using make
if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
# message after building.
@@ -979,6 +980,13 @@ unset(_icon_names)
unset(_icon_files)
unset(_f)
+# -----------------------------------------------------------------------------
+# Studio Lights
+install(
+ DIRECTORY
+ ${CMAKE_SOURCE_DIR}/release/datafiles/studiolights
+ DESTINATION ${TARGETDIR_VER}/datafiles
+)
# -----------------------------------------------------------------------------
# Setup link libs