[Bf-blender-cvs] [410880552bf] master: Cleanup: trailing space for freestyle
Campbell Barton
noreply at git.blender.org
Sun Jun 17 17:07:14 CEST 2018
Commit: 410880552bfaf32f91eaad56bdf2c93c67cbd5c8
Author: Campbell Barton
Date: Sun Jun 17 17:05:14 2018 +0200
Branches: master
https://developer.blender.org/rB410880552bfaf32f91eaad56bdf2c93c67cbd5c8
Cleanup: trailing space for freestyle
===================================================================
M source/blender/freestyle/intern/application/AppCanvas.cpp
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/freestyle/intern/geometry/FastGrid.h
M source/blender/freestyle/intern/geometry/FitCurve.cpp
M source/blender/freestyle/intern/geometry/FitCurve.h
M source/blender/freestyle/intern/geometry/GeomUtils.h
M source/blender/freestyle/intern/geometry/Grid.cpp
M source/blender/freestyle/intern/geometry/GridHelpers.h
M source/blender/freestyle/intern/geometry/SweepLine.h
M source/blender/freestyle/intern/geometry/VecMat.h
M source/blender/freestyle/intern/geometry/matrix_util.cpp
M source/blender/freestyle/intern/image/GaussianFilter.h
M source/blender/freestyle/intern/python/BPy_Convert.cpp
M source/blender/freestyle/intern/python/BPy_Convert.h
M source/blender/freestyle/intern/python/BPy_Freestyle.cpp
M source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
M source/blender/freestyle/intern/python/BPy_Interface0D.cpp
M source/blender/freestyle/intern/python/BPy_MediumType.cpp
M source/blender/freestyle/intern/python/BPy_SShape.cpp
M source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
M source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
M source/blender/freestyle/intern/python/BPy_ViewShape.cpp
M source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
M source/blender/freestyle/intern/python/Director.cpp
M source/blender/freestyle/intern/python/Director.h
M source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
M source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
M source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/scene_graph/LineRep.cpp
M source/blender/freestyle/intern/scene_graph/Node.h
M source/blender/freestyle/intern/scene_graph/NodeCamera.h
M source/blender/freestyle/intern/scene_graph/NodeGroup.h
M source/blender/freestyle/intern/scene_graph/NodeLight.cpp
M source/blender/freestyle/intern/scene_graph/NodeLight.h
M source/blender/freestyle/intern/scene_graph/Rep.h
M source/blender/freestyle/intern/scene_graph/TriangleRep.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M source/blender/freestyle/intern/stroke/Canvas.h
M source/blender/freestyle/intern/stroke/ChainingIterators.h
M source/blender/freestyle/intern/stroke/ContextFunctions.h
M source/blender/freestyle/intern/stroke/Curve.cpp
M source/blender/freestyle/intern/stroke/Curve.h
M source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
M source/blender/freestyle/intern/stroke/CurveIterators.h
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/stroke/Operators.h
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/freestyle/intern/stroke/StrokeRenderer.h
M source/blender/freestyle/intern/stroke/StrokeRep.cpp
M source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
M source/blender/freestyle/intern/system/Id.h
M source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
M source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
M source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
M source/blender/freestyle/intern/view_map/Functions0D.cpp
M source/blender/freestyle/intern/view_map/Functions1D.h
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/freestyle/intern/view_map/SphericalGrid.h
M source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M source/blender/freestyle/intern/view_map/SteerableViewMap.h
M source/blender/freestyle/intern/view_map/ViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMap.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewMapBuilder.h
M source/blender/freestyle/intern/view_map/ViewMapIO.cpp
M source/blender/freestyle/intern/view_map/ViewMapIterators.h
===================================================================
diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index f621f45ff77..aca725a0384 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -64,7 +64,7 @@ void AppCanvas::setViewer(AppView *iViewer)
_pViewer = iViewer;
}
-int AppCanvas::width() const
+int AppCanvas::width() const
{
return _pViewer->width();
}
@@ -84,7 +84,7 @@ float AppCanvas::thickness() const
return _pViewer->thickness();
}
-BBox<Vec3r> AppCanvas::scene3DBBox() const
+BBox<Vec3r> AppCanvas::scene3DBBox() const
{
return _pViewer->scene3DBBox();
}
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index e84d85416dd..46db99a8d51 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -471,11 +471,11 @@ void Controller::ComputeViewMap()
// retrieve the 3D viewpoint and transformations information
//----------------------------------------------------------
- // Save the viewpoint context at the view level in order
+ // Save the viewpoint context at the view level in order
// to be able to restore it later:
// Restore the context of view:
- // we need to perform all these operations while the
+ // we need to perform all these operations while the
// 3D context is on.
Vec3f vp(UNPACK3(g_freestyle.viewpoint));
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 1f5e2b63bfa..f16c4c3574b 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -668,7 +668,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
}
}
- // We might have several times the same vertex. We want a clean
+ // We might have several times the same vertex. We want a clean
// shape with no real-vertex. Here, we are making a cleaning pass.
float *cleanVertices = NULL;
unsigned int cvSize;
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 71c77b60a07..d885ef4735f 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -113,7 +113,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
freestyle_scene->r.gauss = old_scene->r.gauss;
freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity;
BLI_strncpy(freestyle_scene->r.engine, old_scene->r.engine, sizeof(freestyle_scene->r.engine));
- freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA;
+ freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA;
freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG;
if (G.debug & G_DEBUG_FREESTYLE) {
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index ea22633c50e..45da59e9215 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -96,7 +96,7 @@ static bCallbackFuncStore load_post_callback_funcstore = {
};
//=======================================================
-// Initialization
+// Initialization
//=======================================================
void FRS_initialize()
@@ -133,7 +133,7 @@ void FRS_exit()
}
//=======================================================
-// Rendering
+// Rendering
//=======================================================
static void init_view(Render *re)
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index 355a6e53399..75624bb9d9c 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.h
+++ b/source/blender/freestyle/intern/geometry/FastGrid.h
@@ -32,7 +32,7 @@
namespace Freestyle {
-/*! Class to define a regular grid used for ray casting computations
+/*! Class to define a regular grid used for ray casting computations
* We don't use a hashtable here. The grid is explicitly stored for faster computations.
* However, this might result in significant increase in memory usage (compared to the regular grid)
*/
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index fbfa5b331e6..fd7d63bbd28 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -61,7 +61,7 @@ static double V2SquaredLength(Vector2 *a)
}
/* returns length of input vector */
-static double V2Length(Vector2 *a)
+static double V2Length(Vector2 *a)
{
return (sqrt(V2SquaredLength(a)));
}
@@ -96,7 +96,7 @@ static Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c)
(*c)[0] = (*a)[0] + (*b)[0];
(*c)[1] = (*a)[1] + (*b)[1];
return c;
-}
+}
/* normalizes the input vector and returns it */
static Vector2 *V2Normalize(Vector2 *v)
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h
index 2268f6be1b7..c402f431c27 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.h
+++ b/source/blender/freestyle/intern/geometry/FitCurve.h
@@ -90,7 +90,7 @@ public:
* Control points of the sets of bezier curve segments.
* Each segment is made of 4 points (polynomial degree of curve = 3)
* error
- * max error tolerance between resulting curve and input data
+ * max error tolerance between resulting curve and input data
*/
void FitCurve(std::vector<Vec2d>& data, std::vector<Vec2d>& oCurve, double error);
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h
index 8f3abf451c9..9e7c629191f 100644
--- a/source/blender/freestyle/intern/geometry/GeomUtils.h
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.h
@@ -174,7 +174,7 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][
*/
void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]);
-/*! Projects from world coordinates to camera coordinates
+/*! Projects from world coordinates to camera coordinates
* Returns the point's coordinates expressed in the camera's
* coordinates system.
* p
@@ -220,7 +220,7 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]);
*/
void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]);
-/*! computes the coordinates of q in the camera coordinates system,
+/*! computes the coordinates of q in the camera coordinates system,
* using the known z coordinates of the 3D point.
* That means that this method does not inverse any matrices,
* it only computes X and Y from x,y and Z)
diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index 371c63318de..61cf70a0aa3 100644
--- a/source/blender/freestyle/intern/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
@@ -242,7 +242,7 @@ bool Grid::nextRayCell(Vec3u& current_cell, Vec3u& next_cell)
real t_min, t;
unsigned i;
- t_min = FLT_MAX; // init tmin with handle of the case where one or 2 _u[i] = 0.
+ t_min = FLT_MAX; // init tmin with handle of the case where one or 2 _u[i] = 0.
unsigned coord = 0; // predominant coord(0=x, 1=y, 2=z)
diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.h b/source/blender/freestyle/intern/geometry/GridHelpers.h
index 22efdcf1d11..4dd345e9b07 100644
--- a/source/blender/freestyle/intern/geometry/GridHelpers.h
+++ b/source/blender/freestyle/intern/geometry/GridHelpers.h
@@ -73,7 +73,7 @@ T closestPointToSegment(const T& P, const T& A, const T& B, real& distance)
distance = PPb.norm();
return Pb; // closest point lies on AB
-}
+}
inline Vec3r closestPointOnPolygon(const Vec3r& point, const Polygon3r& poly)
{
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index 039ecd7ebf4..98e860862bb 100644
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -216,7 +216,7 @@ struct binary_rule
template<class T, class Point>
-class SweepLine
+class SweepLine
{
public:
SweepLine() {}
@@ -231,7 +231,7 @@ public:
}
}
- inline void process(Point& p, vector<Segment<T, Point>*>& segments,
+ inline void process(Point& p, vector<Segment<T, Point>*>& segments,
#if 0
binary_rule<Segment<T, Point>,Segment<T, Point> >& binrule = \
binary_rule<Segment<T, Point>, Segment<T, Point> >(),
diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h
index 3c3d40875d0..e7a44e00b1b 100644
--- a/source/blender/freestyle/intern/geometry/VecMat.h
+++ b/source/blender/freestyle/intern/geometry/VecMat.h
@@ -150,21 +150,21 @@ public:
Vec<T, N> res(v);
res += *this;
return res;
- }
+ }
inline Vec<T, N> operator-(const Vec<T, N>& v) const
{
Vec<T, N> res(*this);
res -= v;
return res;
- }
+ }
inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r) const
{
Vec<T, N> res(*this);
res *= r;
return res;
- }
+ }
inline Vec<T, N> operator/(const typename Vec<T, N>::value_type r) const
{
@@ -172,7 +172,7 @@ public:
if (r)
res /= r;
return res;
- }
+ }
// dot product
inline value_type operator*(const Vec<T, N>& v) const
@@ -181,7 +181,7 @@ public:
for (unsigned int i = 0; i < N; i++)
sum += (*this)[i] * v[i];
return sum;
- }
+ }
template <class U>
inline Vec<T, N>& operator=(const Vec<U,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list