diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
| commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
| tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/compositor | |
| parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
| parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/intern/COM_ExecutionGroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 99365cdd4a8..d3b11accd96 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -64,7 +64,7 @@ typedef enum ChunkExecutionState { */ class ExecutionGroup { public: - typedef std::vector<NodeOperation*> Operations; + typedef std::vector<NodeOperation*> Operations; private: // fields |