[Bf-blender-cvs] [868e0e30626] compositor-full-frame: Merge branch 'master' into compositor-full-frame

[Manuel Castilla]

Commit: 868e0e306263f33317c657112f0b8d9e0550abb5
Author: Manuel Castilla
Date:   Tue Aug 10 18:37:44 2021 +0200
Branches: compositor-full-frame
https://developer.blender.org/rB868e0e306263f33317c657112f0b8d9e0550abb5

Merge branch 'master' into compositor-full-frame

===================================================================



===================================================================

diff --cc source/blender/compositor/operations/COM_TonemapOperation.cc
index 4d7e15603a7,20da468eeb1..119d5f1238b
--- a/source/blender/compositor/operations/COM_TonemapOperation.cc
+++ b/source/blender/compositor/operations/COM_TonemapOperation.cc
@@@ -16,10 -16,8 +16,11 @@@
   * Copyright 2011, Blender Foundation.
   */
  
 +#include "IMB_colormanagement.h"
 +
 +#include "COM_ExecutionSystem.h"
  #include "COM_TonemapOperation.h"
+ #include "COM_ExecutionSystem.h"
  
  #include "BLI_math.h"
  #include "BLI_utildefines.h"