kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Compositor: Code cleanup, trailing whitespace and wrapping

Browse Source
This commit is contained in:
Sergey Sharybin 2015-02-04 13:04:09 +05:00
parent 1dddcfbaff
commit d16ac1e152
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
View File

@ -64,7 +64,9 @@ public:
BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES);
this->m_motion_blur_samples = samples;
}
void setMotionBlurShutter(float shutter) { this->m_motion_blur_shutter = shutter; }
void setMotionBlurShutter(float shutter) {
this->m_motion_blur_shutter = shutter;
}
};
@ -94,7 +96,9 @@ public:
BLI_assert(samples <= PLANE_DISTORT_MAX_SAMPLES);
this->m_motion_blur_samples = samples;
}
void setMotionBlurShutter(float shutter) { this->m_motion_blur_shutter = shutter; }
void setMotionBlurShutter(float shutter) {
this->m_motion_blur_shutter = shutter;
}
};
#endif

4
source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
View File

@ -59,9 +59,7 @@ void PlaneTrackCommon::readCornersFromTrack(float corners[4][2], float frame)
object = BKE_tracking_object_get_named(tracking, this->m_trackingObjectName);
if (object) {
MovieTrackingPlaneTrack *plane_track;
plane_track = BKE_tracking_plane_track_get_named(tracking, object, this->m_planeTrackName);
if (plane_track) {
MovieTrackingPlaneMarker *plane_marker;
float clip_framenr =
@ -83,10 +81,8 @@ void PlaneTrackCommon::determineResolution(unsigned int resolution[2], unsigned
if (this->m_movieClip) {
int width, height;
MovieClipUser user = {0};
BKE_movieclip_user_set_frame(&user, this->m_framenumber);
BKE_movieclip_get_size(this->m_movieClip, &user, &width, &height);
resolution[0] = width;
resolution[1] = height;
}

1
source/blender/compositor/operations/COM_PlaneTrackOperation.h
View File

@ -87,7 +87,6 @@ public:
void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
{
PlaneTrackCommon::determineResolution(resolution, preferredResolution);
unsigned int temp[2];
NodeOperation::determineResolution(temp, resolution);
}