[Bf-blender-cvs] [55c720f] master: Fix T39936: Plane Track operation would not initialize resolutions for upstream nodes.
Lukas Tönne
noreply at git.blender.org
Tue Apr 29 10:44:46 CEST 2014
Commit: 55c720f06e2c2edd738ecb9d1fa45b9ef379e62a
Author: Lukas Tönne
Date: Tue Apr 29 10:37:40 2014 +0200
https://developer.blender.org/rB55c720f06e2c2edd738ecb9d1fa45b9ef379e62a
Fix T39936: Plane Track operation would not initialize resolutions for
upstream nodes.
===================================================================
M source/blender/compositor/COM_defines.h
M source/blender/compositor/operations/COM_PlaneTrackOperation.h
===================================================================
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h
index d086f81..bc8e47e 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 fdca760..3c5dd78 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);
}
};
More information about the Bf-blender-cvs
mailing list