diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 06:14:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 06:14:07 +0300 |
| commit | 81e99bdc75fe03726bb40525dff106dcd3593cbf (patch) | |
| tree | 0547c2c0dca3874261e6de1de618a34921e62b9b | |
| parent | e71470e3160ea37df46d4808c3c63d899a997205 (diff) | |
| parent | bb8497fd5d4a647c0b7221ed965dc58c9547a820 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/compositor/operations/COM_MovieClipOperation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index fae889ed202..2b696cd5df6 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -21,8 +21,8 @@ */ -#ifndef __COM_IMAGEOPERATION_H__ -#define __COM_IMAGEOPERATION_H__ +#ifndef __COM_MOVIECLIPOPERATION_H__ +#define __COM_MOVIECLIPOPERATION_H__ #include "COM_NodeOperation.h" #include "DNA_movieclip_types.h" |