[Bf-blender-cvs] [d16ac1e] master: Compositor: Code cleanup, trailing whitespace and wrapping

[Sergey Sharybin]

Commit: d16ac1e152a3b7ec7807698b3622056e6951ccd5
Author: Sergey Sharybin
Date:   Wed Feb 4 13:04:09 2015 +0500
Branches: master
https://developer.blender.org/rBd16ac1e152a3b7ec7807698b3622056e6951ccd5

Compositor: Code cleanup, trailing whitespace and wrapping

===================================================================

M       source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
M       source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
M       source/blender/compositor/operations/COM_PlaneTrackOperation.h

===================================================================

diff --git 
a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h 
b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
index 6ceb476..fc5dd1f 100644
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
@@ -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;
+       }
 };
 
 
@@ -81,20 +83,22 @@ protected:
 
 public:
        PlaneDistortMaskOperation();
-       
+
        void calculateCorners(const float corners[4][2],
                              bool normalized,
                              int sample);
-       
+
        void initExecution();
-       
+
        void executePixelSampled(float output[4], float x, float y, 
PixelSampler sampler);
 
        void setMotionBlurSamples(int samples) {
                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
diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp 
b/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
index f615298..20a8fa9 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
@@ -53,15 +53,13 @@ void PlaneTrackCommon::readCornersFromTrack(float 
corners[4][2], float frame)
 
        if (!this->m_movieClip)
                return;
-       
+
        tracking = &this->m_movieClip->tracking;
-       
+
        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 =
@@ -79,14 +77,12 @@ void PlaneTrackCommon::determineResolution(unsigned int 
resolution[2], unsigned
 {
        resolution[0] = 0;
        resolution[1] = 0;
-       
+
        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;
        }
diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h 
b/source/blender/compositor/operations/COM_PlaneTrackOperation.h
index b355c64..4176149 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h
+++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h
@@ -68,7 +68,7 @@ public:
        void determineResolution(unsigned int resolution[2], unsigned int 
preferredResolution[2])
        {
                PlaneTrackCommon::determineResolution(resolution, 
preferredResolution);
-               
+
                unsigned int temp[2];
                NodeOperation::determineResolution(temp, resolution);
        }
@@ -81,13 +81,12 @@ public:
            PlaneDistortWarpImageOperation(),
            PlaneTrackCommon()
        {}
-       
+
        void initExecution();
-       
+
        void determineResolution(unsigned int resolution[2], unsigned int 
preferredResolution[2])
        {
                PlaneTrackCommon::determineResolution(resolution, 
preferredResolution);
-               
                unsigned int temp[2];
                NodeOperation::determineResolution(temp, resolution);
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs