diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 662212567de..1af206920c5 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -28,40 +28,40 @@ extern "C" { MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() { this->addOutputSocket(COM_DT_VALUE); - this->valueSet = false; - this->framenumber = 0; - this->attribute = MCA_X; + this->m_valueSet = false; + this->m_framenumber = 0; + this->m_attribute = MCA_X; } void MovieClipAttributeOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { - if (!valueSet) { + if (!this->m_valueSet) { float loc[2], scale, angle; loc[0] = 0.0f; loc[1] = 0.0f; scale = 1.0f; angle = 0.0f; - if (clip) { - int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, framenumber); - BKE_tracking_stabilization_data_get(&clip->tracking, clip_framenr, getWidth(), getHeight(), loc, &scale, &angle); + if (this->m_clip) { + int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(this->m_clip, this->m_framenumber); + BKE_tracking_stabilization_data_get(&this->m_clip->tracking, clip_framenr, getWidth(), getHeight(), loc, &scale, &angle); } - switch (this->attribute) { + switch (this->m_attribute) { case MCA_SCALE: - this->value = scale; + this->m_value = scale; break; case MCA_ANGLE: - this->value = angle; + this->m_value = angle; break; case MCA_X: - this->value = loc[0]; + this->m_value = loc[0]; break; case MCA_Y: - this->value = loc[1]; + this->m_value = loc[1]; break; } - valueSet = true; + this->m_valueSet = true; } - outputValue[0] = this->value; + outputValue[0] = this->m_value; } void MovieClipAttributeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) |