diff options
| author | Omar Emara <mail@OmarEmara.dev> | 2022-08-09 16:59:56 +0300 |
|---|---|---|
| committer | Omar Emara <mail@OmarEmara.dev> | 2022-08-09 16:59:56 +0300 |
| commit | 9990792e87238386375c97f431f648c1334bd587 (patch) | |
| tree | f1d1291d698dcd561a2dbf231121e60893fc034b /source/blender/windowmanager | |
| parent | f6639cc4fc1fd9fbbe1454ce216d6d0c8fe1ebdf (diff) | |
Compositor: Rename compositor build option
Currently, the compositor can be disabled using the WITH_COMPOSITOR
build option. Since, we intent to always build the realtime compositor,
we need to make the distinction between both compositors clear.
So this patch renames the option to WITH_COMPOSITOR_CPU. Additionally,
the check for the option was moved inside the compositor modules' own
CMake file in preparation for the realtime compositor code.
Differential Revision: https://developer.blender.org/D15622
Reviewed By: Jeroen Bakker, Ray Molenkamp
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 6cbd21d0abe..c434638549c 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -165,11 +165,11 @@ if(WIN32 OR APPLE) endif() endif() -if(WITH_COMPOSITOR) +if(WITH_COMPOSITOR_CPU) list(APPEND LIB bf_compositor ) - add_definitions(-DWITH_COMPOSITOR) + add_definitions(-DWITH_COMPOSITOR_CPU) endif() if(WITH_XR_OPENXR) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 7f5ec77e16d..624e434e784 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -540,7 +540,7 @@ void WM_exit_ex(bContext *C, const bool do_python) BKE_vfont_clipboard_free(); BKE_node_clipboard_free(); -#ifdef WITH_COMPOSITOR +#ifdef WITH_COMPOSITOR_CPU COM_deinitialize(); #endif |