diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 14:59:39 +0300 |
commit | b8ab411185c11ce98e7e791b0d30a9d9b1ce6d69 (patch) | |
tree | 9c219e06fc6a1f9b09d6fbf7d86c8526cfa6d775 /source/blender/compositor/intern/COM_ExecutionSystem.h | |
parent | 209686f1c8189bc01f91d14a922651844df8b201 (diff) | |
parent | dc2d841b7c50565302af2986d62ddbd29c332acd (diff) |
Merge branch 'hair_guides' into hair_guides_groominghair_guides_grooming
Diffstat (limited to 'source/blender/compositor/intern/COM_ExecutionSystem.h')
-rw-r--r-- | source/blender/compositor/intern/COM_ExecutionSystem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index acde4a9b772..0990df31c55 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -22,8 +22,8 @@ class ExecutionGroup; -#ifndef _COM_ExecutionSystem_h -#define _COM_ExecutionSystem_h +#ifndef __COM_EXECUTIONSYSTEM_H__ +#define __COM_EXECUTIONSYSTEM_H__ #include "DNA_color_types.h" #include "DNA_node_types.h" @@ -185,4 +185,4 @@ private: #endif }; -#endif /* _COM_ExecutionSystem_h */ +#endif /* __COM_EXECUTIONSYSTEM_H__ */ |