diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/compositor/intern/COM_ExecutionSystem.cpp | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/compositor/intern/COM_ExecutionSystem.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index d502deb1c93..fa40f150335 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -18,8 +18,8 @@ #include "COM_ExecutionSystem.h" -#include "PIL_time.h" #include "BLI_utildefines.h" +#include "PIL_time.h" extern "C" { #include "BKE_node.h" } @@ -27,12 +27,12 @@ extern "C" { #include "BLT_translation.h" #include "COM_Converter.h" -#include "COM_NodeOperationBuilder.h" -#include "COM_NodeOperation.h" +#include "COM_Debug.h" #include "COM_ExecutionGroup.h" -#include "COM_WorkScheduler.h" +#include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" #include "COM_ReadBufferOperation.h" -#include "COM_Debug.h" +#include "COM_WorkScheduler.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" |