[Bf-blender-cvs] [b54ab323aaa] KTX_support: merge with master. It should build with option off, but cmake support/libs are not yet plugged in
Antonis Ryakiotakis
noreply at git.blender.org
Wed Jan 19 01:03:28 CET 2022
Commit: b54ab323aaa4875a29b39e3b981c273446ff976f
Author: Antonis Ryakiotakis
Date: Wed Jan 19 01:01:56 2022 +0100
Branches: KTX_support
https://developer.blender.org/rBb54ab323aaa4875a29b39e3b981c273446ff976f
merge with master. It should build with option off, but cmake support/libs are not yet plugged in
===================================================================
===================================================================
diff --cc CMakeLists.txt
index 6f9a743817a,380acbbba0f..7264dd556d1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -302,9 -299,6 +299,7 @@@ option(WITH_IMAGE_TIFF "Enabl
option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
- option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" ${_init_IMAGE_REDCODE})
- option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
- option(WITH_IMAGE_KTX "Enable KTX image support" ON)
++option(WITH_IMAGE_KTX "Enable KTX image support" OFF)
# Audio/Video format support
option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON)
@@@ -2868,120 -1951,124 +1952,125 @@@ endif(
if(FIRST_RUN)
- set(_config_msg "\nBlender Configuration\n=====================")
-
- function(info_cfg_option
- _setting
- )
-
- set(_msg " - ${_setting}")
- string(LENGTH "${_msg}" _len)
- while("32" GREATER "${_len}")
- set(_msg "${_msg} ")
- math(EXPR _len "${_len} + 1")
- endwhile()
-
- set(_config_msg "${_config_msg}\n${_msg}${${_setting}}" PARENT_SCOPE)
- endfunction()
-
- function(info_cfg_text
- _text
- )
-
- set(_config_msg "${_config_msg}\n\n ${_text}" PARENT_SCOPE)
- endfunction()
-
- message(STATUS "C Compiler: \"${CMAKE_C_COMPILER_ID}\"")
- message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
-
- info_cfg_text("Build Options:")
- info_cfg_option(WITH_GAMEENGINE)
- info_cfg_option(WITH_PLAYER)
- info_cfg_option(WITH_BULLET)
- info_cfg_option(WITH_IK_SOLVER)
- info_cfg_option(WITH_IK_ITASC)
- info_cfg_option(WITH_OPENCOLLADA)
- info_cfg_option(WITH_FFTW3)
- info_cfg_option(WITH_INTERNATIONAL)
- info_cfg_option(WITH_INPUT_NDOF)
- info_cfg_option(WITH_CYCLES)
- info_cfg_option(WITH_FREESTYLE)
- info_cfg_option(WITH_OPENCOLORIO)
-
- info_cfg_text("Compiler Options:")
- info_cfg_option(WITH_BUILDINFO)
- info_cfg_option(WITH_OPENMP)
- info_cfg_option(WITH_RAYOPTIMIZATION)
-
- info_cfg_text("System Options:")
- info_cfg_option(WITH_INSTALL_PORTABLE)
- info_cfg_option(WITH_X11_XF86VMODE)
- info_cfg_option(WITH_X11_XINPUT)
- info_cfg_option(WITH_MEM_JEMALLOC)
- info_cfg_option(WITH_MEM_VALGRIND)
- info_cfg_option(WITH_SYSTEM_GLEW)
- info_cfg_option(WITH_SYSTEM_OPENJPEG)
-
- info_cfg_text("Image Formats:")
- info_cfg_option(WITH_OPENIMAGEIO)
- info_cfg_option(WITH_IMAGE_CINEON)
- info_cfg_option(WITH_IMAGE_DDS)
- info_cfg_option(WITH_IMAGE_HDR)
- info_cfg_option(WITH_IMAGE_KTX)
- info_cfg_option(WITH_IMAGE_OPENEXR)
- info_cfg_option(WITH_IMAGE_OPENJPEG)
- info_cfg_option(WITH_IMAGE_REDCODE)
- info_cfg_option(WITH_IMAGE_TIFF)
-
- info_cfg_text("Audio:")
- info_cfg_option(WITH_OPENAL)
- info_cfg_option(WITH_SDL)
- info_cfg_option(WITH_SDL_DYNLOAD)
- info_cfg_option(WITH_JACK)
- info_cfg_option(WITH_JACK_DYNLOAD)
- info_cfg_option(WITH_CODEC_AVI)
- info_cfg_option(WITH_CODEC_FFMPEG)
- info_cfg_option(WITH_CODEC_SNDFILE)
-
- info_cfg_text("Compression:")
- info_cfg_option(WITH_LZMA)
- info_cfg_option(WITH_LZO)
-
- info_cfg_text("Python:")
- info_cfg_option(WITH_PYTHON_INSTALL)
- info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
- info_cfg_option(WITH_PYTHON_MODULE)
- info_cfg_option(WITH_PYTHON_SAFETY)
- if(APPLE)
- info_cfg_option(WITH_PYTHON_FRAMEWORK)
- endif()
-
- info_cfg_text("Modifiers:")
- info_cfg_option(WITH_MOD_BOOLEAN)
- info_cfg_option(WITH_MOD_REMESH)
- info_cfg_option(WITH_MOD_FLUID)
- info_cfg_option(WITH_MOD_OCEANSIM)
-
- info_cfg_text("OpenGL:")
- info_cfg_option(WITH_GLEW_ES)
- info_cfg_option(WITH_GLU)
- info_cfg_option(WITH_GL_EGL)
- info_cfg_option(WITH_GL_PROFILE_COMPAT)
- info_cfg_option(WITH_GL_PROFILE_CORE)
- info_cfg_option(WITH_GL_PROFILE_ES20)
- if(WIN32)
- info_cfg_option(WITH_GL_ANGLE)
- endif()
-
- info_cfg_text("Other:")
- info_cfg_option(WITH_OPENNL)
-
- # debug
- message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
-
- info_cfg_text("")
-
- message("${_config_msg}")
+ set(_config_msg "\nBlender Configuration\n=====================")
+
+ function(info_cfg_option
+ _setting
+ )
+
+ set(_msg " - ${_setting}")
+ string(LENGTH "${_msg}" _len)
+ while("32" GREATER "${_len}")
+ string(APPEND _msg " ")
+ math(EXPR _len "${_len} + 1")
+ endwhile()
+
+ set(_config_msg "${_config_msg}\n${_msg}${${_setting}}" PARENT_SCOPE)
+ endfunction()
+
+ function(info_cfg_text
+ _text
+ )
+
+ set(_config_msg "${_config_msg}\n\n ${_text}" PARENT_SCOPE)
+ endfunction()
+
+ message(STATUS "C Compiler: \"${CMAKE_C_COMPILER_ID}\"")
+ message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
+
+ info_cfg_text("Build Options:")
+ info_cfg_option(WITH_ALEMBIC)
+ info_cfg_option(WITH_BULLET)
+ info_cfg_option(WITH_CLANG)
+ info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_FFTW3)
+ info_cfg_option(WITH_FREESTYLE)
+ info_cfg_option(WITH_GMP)
+ info_cfg_option(WITH_HARU)
+ info_cfg_option(WITH_IK_ITASC)
+ info_cfg_option(WITH_IK_SOLVER)
+ info_cfg_option(WITH_INPUT_NDOF)
+ info_cfg_option(WITH_INPUT_IME)
+ info_cfg_option(WITH_INTERNATIONAL)
+ info_cfg_option(WITH_OPENCOLLADA)
+ info_cfg_option(WITH_OPENCOLORIO)
+ info_cfg_option(WITH_OPENIMAGEDENOISE)
+ info_cfg_option(WITH_OPENVDB)
+ info_cfg_option(WITH_POTRACE)
+ info_cfg_option(WITH_PUGIXML)
+ info_cfg_option(WITH_QUADRIFLOW)
+ info_cfg_option(WITH_TBB)
+ info_cfg_option(WITH_USD)
+ info_cfg_option(WITH_XR_OPENXR)
+
+ info_cfg_text("Compiler Options:")
+ info_cfg_option(WITH_BUILDINFO)
+ info_cfg_option(WITH_OPENMP)
+
+ info_cfg_text("System Options:")
+ info_cfg_option(WITH_INSTALL_PORTABLE)
+ info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_MEM_VALGRIND)
+ info_cfg_option(WITH_SYSTEM_GLEW)
+ info_cfg_option(WITH_X11_ALPHA)
+ info_cfg_option(WITH_X11_XF86VMODE)
+ info_cfg_option(WITH_X11_XFIXES)
+ info_cfg_option(WITH_X11_XINPUT)
+
+ info_cfg_text("Image Formats:")
+ info_cfg_option(WITH_IMAGE_CINEON)
+ info_cfg_option(WITH_IMAGE_DDS)
+ info_cfg_option(WITH_IMAGE_HDR)
+ info_cfg_option(WITH_IMAGE_OPENEXR)
+ info_cfg_option(WITH_IMAGE_OPENJPEG)
+ info_cfg_option(WITH_IMAGE_TIFF)
+ info_cfg_option(WITH_OPENIMAGEIO)
++ info_cfg_option(WITH_IMAGE_KTX)
+
+ info_cfg_text("Audio:")
+ info_cfg_option(WITH_CODEC_AVI)
+ info_cfg_option(WITH_CODEC_FFMPEG)
+ info_cfg_option(WITH_CODEC_SNDFILE)
+ info_cfg_option(WITH_COREAUDIO)
+ info_cfg_option(WITH_JACK)
+ info_cfg_option(WITH_JACK_DYNLOAD)
+ info_cfg_option(WITH_OPENAL)
+ info_cfg_option(WITH_PULSEAUDIO)
+ info_cfg_option(WITH_PULSEAUDIO_DYNLOAD)
+ info_cfg_option(WITH_SDL)
+ info_cfg_option(WITH_SDL_DYNLOAD)
+ info_cfg_option(WITH_WASAPI)
+
+ info_cfg_text("Compression:")
+ info_cfg_option(WITH_LZMA)
+ info_cfg_option(WITH_LZO)
+
+ info_cfg_text("Python:")
+ if(APPLE)
+ info_cfg_option(WITH_PYTHON_FRAMEWORK)
+ endif()
+ info_cfg_option(WITH_PYTHON_INSTALL)
+ info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
+ info_cfg_option(WITH_PYTHON_INSTALL_ZSTANDARD)
+ info_cfg_option(WITH_PYTHON_MODULE)
+ info_cfg_option(WITH_PYTHON_SAFETY)
+
+ info_cfg_text("Modifiers:")
+ info_cfg_option(WITH_MOD_FLUID)
+ info_cfg_option(WITH_MOD_OCEANSIM)
+ info_cfg_option(WITH_MOD_REMESH)
+
+ info_cfg_text("OpenGL:")
+ if(WIN32)
+ info_cfg_option(WITH_GL_ANGLE)
+ endif()
+ info_cfg_option(WITH_GL_EGL)
+ info_cfg_option(WITH_GL_PROFILE_ES20)
+ info_cfg_option(WITH_GLEW_ES)
+
+ info_cfg_text("")
+
+ message("${_config_msg}")
endif()
if(0)
diff --cc release/datafiles/locale
index c651e63a9a5,620b85f16d0..68f8874599d
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
-Subproject commit 620b85f16d03a6aadd7cae56969c9c29b06b992d
++Subproject commit 68f8874599d7fbac10fa332535450d8a78fafda2
diff --cc release/scripts/addons
index 3fc5b82c6bd,c08568cc376..0574f418a03
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3fc5b82c6bdba2f9c954fbf497621b9bb794a1bc
-Subproject commit c08568cc376d2e4298710c4172fb0c74f0611de1
++Subproject commit 0574f418a03e2dddfac8b402ce1fb8c33b6b25d5
diff --cc source/blender/blenkernel/CMakeLists.txt
index c85747d92d1,b5b8f629970..8916a393a19
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -365,28 -604,14 +604,18 @@@ if(WITH_IMAGE_FRAMESERVER
endif()
if(WITH_IMAGE_HDR)
- add_definitions(-DWITH_HDR)
+ add_definitions(-DWITH_HDR)
endif()
+if(WITH_IMAGE_KTX)
+ add_definitions(-DWITH_KTX)
+endif()
+
if(WITH_CODEC_AVI)
- list(APPEND INC
- ../avi
- )
- add_definitions(-DWITH_AVI)
- endif()
-
- if(WITH_CODEC_QUICKTIME)
- list(APPEND INC
- ../quicktime
- )
- list(APPEND INC_SYS
- ${QUICKTIME_INCLUDE_DIRS}
- )
- add_definitions(-DWITH_QUICKTIME)
+ list(APPEND INC
+ ../io/avi
+ )
+ add_definitions(-DWITH_AVI)
endif()
if(WITH_CODEC_FFMPEG)
diff --cc source/blender/blenkernel/intern/image.c
index 7f9a35e0ac7,23b1054f814..1e9ff38384f
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -1180,129 -1416,150 +1416,154 @@@ void BKE_image_free_all_textures(Main *
static bool imagecache_check_free_anim(ImBuf *ibuf, void *UNUSED(userkey), void *userdata)
{
- int except_frame = *(int *)userdata;
- return (ibuf->userflags & IB_BITMAPDIRTY) == 0 &&
- (ibuf->index != IMA_NO_INDEX) &&
- (except_frame != IMA_INDEX_FRAME(ibuf->index));
+ if (ibuf == NULL) {
+ return true;
+ }
+ int except_frame = *(int *)userdata;
+ return (ibuf->userflags & IB_BITMAPDIRTY) == 0 && (ibuf->index != IMA_NO_INDEX) &&
+ (except_frame != IMA_INDEX_ENTRY(ibuf->index));
}
- /* except_frame is weak, only works for seqs without offset... */
void BKE_image_free_anim_ibufs(Image *ima, int except_frame)
{
- BLI_spin_lock(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list