diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | |
parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
parent | b3727668168075137f2ded11d7a7821548e4451d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 5f8c3ef435c..c1c159f80a0 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -87,4 +87,3 @@ void MovieClipAttributeOperation::determineResolution( resolution[0] = preferredResolution[0]; resolution[1] = preferredResolution[1]; } - |