From c84b18790d220d9468aa817e78c16088bb0de57d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 5 Sep 2013 09:39:38 +0000 Subject: Merge some operations into a single file This merges all mix operations into a COM_MixBaseOperation (naming could be better, but this way it corresponds to what's going on with math operations. Same was done with RenderLayers operations. Overall this gives 20% of bf_compositor library compilation time decrease. And it was rather annoying to have tens of files with just a single-line constructors anyway. TODO: - All Convert operations could also be merged into a single file, but that would require adding some ConvertBaseOperation to reduce code duplication (ideally). Leaving it unchanged for now. - Some operations' headers seems to be wrongly including MixOperation header, they need to include NodeOperation instead it seems. This is rather harmless, but would be nice to doublecheck on this eventually. --- source/blender/compositor/operations/COM_ZCombineOperation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/compositor/operations/COM_ZCombineOperation.h') diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index 4545775f26f..eeeb29d330f 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -22,7 +22,7 @@ #ifndef _COM_ZCombineOperation_h #define _COM_ZCombineOperation_h -#include "COM_MixBaseOperation.h" +#include "COM_MixOperation.h" /** -- cgit v1.2.3