diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-12 15:32:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-12 15:32:09 +0300 |
| commit | 6f36e1f872a61c36cc5242d20476886c3061fa3f (patch) | |
| tree | f1f1acb2d97c41c7ddafcc4f189f0265f9336a30 | |
| parent | efe4af8fcbf9987dd1563a2f49ce606d3c14d808 (diff) | |
Fix compilation error on Windows
The issue was caused by conflicting declaration of HKEY
happening in our WM code and somewhere deeper in atomic
operations headers hierarchy.
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index a7f45ffdf81..025ed76907d 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -25,6 +25,8 @@ #include <sstream> #include <stdlib.h> +#include "atomic_ops.h" + #include "COM_ExecutionGroup.h" #include "COM_defines.h" #include "COM_ExecutionSystem.h" @@ -44,8 +46,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "atomic_ops.h" - ExecutionGroup::ExecutionGroup() { this->m_isOutput = false; |