Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-08-08 13:14:07 +10:00
commit 81e99bdc75
1 changed files with 2 additions and 2 deletions

View File

@ -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"