diff options
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/compositor/COM_defines.h | 2 | ||||
-rw-r--r-- | source/blender/compositor/COM_precomp.h | 33 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_OutputFileOperation.h | 2 |
4 files changed, 2 insertions, 44 deletions
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 905d1443002..96dc17c2d1a 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -647,15 +647,6 @@ endif() blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -if(WITH_UNITY_BUILD) - set_target_properties(bf_compositor PROPERTIES UNITY_BUILD ON) - set_target_properties(bf_compositor PROPERTIES UNITY_BUILD_BATCH_SIZE 10) -endif() - -if(COMMAND target_precompile_headers) - target_precompile_headers(bf_compositor PRIVATE COM_precomp.h) -endif() - if(CXX_WARN_NO_SUGGEST_OVERRIDE) target_compile_options(bf_compositor PRIVATE "-Wsuggest-override") endif() diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index 1c3a28670df..794bf1b23bc 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -18,7 +18,7 @@ #pragma once -#include "BLI_float2.hh" +#include "BLI_math_vec_types.hh" #include "DNA_vec_types.h" diff --git a/source/blender/compositor/COM_precomp.h b/source/blender/compositor/COM_precomp.h deleted file mode 100644 index 4d2681ea0cd..00000000000 --- a/source/blender/compositor/COM_precomp.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Pre-compiled headers, see: D13797. */ - -#include <cfloat> -#include <climits> -#include <cmath> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <functional> -#include <iostream> -#include <iterator> -#include <list> -#include <map> -#include <ostream> -#include <set> -#include <string> - -#include "COM_ConstantOperation.h" -#include "COM_ConvertOperation.h" -#include "COM_Debug.h" -#include "COM_Enums.h" -#include "COM_ExecutionGroup.h" -#include "COM_ExecutionSystem.h" -#include "COM_MultiThreadedOperation.h" -#include "COM_Node.h" -#include "COM_NodeOperation.h" -#include "COM_OpenCLDevice.h" -#include "COM_SetAlphaMultiplyOperation.h" -#include "COM_SetColorOperation.h" -#include "COM_SetSamplerOperation.h" -#include "COM_SetValueOperation.h" -#include "COM_SetVectorOperation.h" -#include "COM_defines.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index e601ebac4e1..0e871f47b87 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -136,7 +136,7 @@ void add_exr_channels(void *exrhandle, const char *layer_name, const DataType datatype, const char *view_name, - size_t width, + const size_t width, bool use_half_float, float *buf); void free_exr_channels(void *exrhandle, |