diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-04-29 12:37:40 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-04-29 12:38:50 +0400 |
commit | 55c720f06e2c2edd738ecb9d1fa45b9ef379e62a (patch) | |
tree | dcef0d51ca32f65e3528f5526e54f7ad6569429e /source | |
parent | 409fb4da0ce671d9c5cf54cb327770d6b4e97cb2 (diff) |
Fix T39936: Plane Track operation would not initialize resolutions for
upstream nodes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/compositor/COM_defines.h | 2 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_PlaneTrackOperation.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index d086f81d03c..bc8e47e7914 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -68,7 +68,7 @@ typedef enum CompositorPriority { // chunk size determination #define COM_PREVIEW_SIZE 140.0f #define COM_OPENCL_ENABLED -//#define COM_DEBUG +#define COM_DEBUG // workscheduler threading models /** diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h b/source/blender/compositor/operations/COM_PlaneTrackOperation.h index fdca760650a..3c5dd783542 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h @@ -68,6 +68,9 @@ public: void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { PlaneTrackCommon::determineResolution(resolution, preferredResolution); + + unsigned int temp[2]; + NodeOperation::determineResolution(temp, resolution); } }; @@ -84,6 +87,9 @@ public: void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]) { PlaneTrackCommon::determineResolution(resolution, preferredResolution); + + unsigned int temp[2]; + NodeOperation::determineResolution(temp, resolution); } }; |