diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:01:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:59:11 +0300 |
commit | 744f6339865fa8ed00b2e98aa5812b94d67a8604 (patch) | |
tree | ac31a849b46a8214baf16b87e104841a5fa85b11 /source/blender/freestyle/intern | |
parent | 141c6073ca39f0d59c67ebef89b094395b903a4a (diff) |
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'source/blender/freestyle/intern')
33 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index f750645893a..ecf7833575c 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -342,7 +342,7 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) {FREESTYLE_FE_MATERIAL_BOUNDARY, 0}, {FREESTYLE_FE_CONTOUR, 0}, {FREESTYLE_FE_EXTERNAL_CONTOUR, 0}, - {FREESTYLE_FE_EDGE_MARK, 0} + {FREESTYLE_FE_EDGE_MARK, 0}, }; int num_edge_types = sizeof(conditions) / sizeof(struct edge_type_condition); if (G.debug & G_DEBUG_FREESTYLE) { diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index 82fd7d03800..8c9d947d04e 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -664,7 +664,7 @@ void fromCameraToWorld(const Vec3r& p, Vec3r& q, const real model_view_matrix[4] real translation[3] = { model_view_matrix[0][3], model_view_matrix[1][3], - model_view_matrix[2][3] + model_view_matrix[2][3], }; for (unsigned short i = 0; i < 3; i++) { q[i] = 0.0; diff --git a/source/blender/freestyle/intern/geometry/GridHelpers.h b/source/blender/freestyle/intern/geometry/GridHelpers.h index 99b72d0cbab..29c6c00d492 100644 --- a/source/blender/freestyle/intern/geometry/GridHelpers.h +++ b/source/blender/freestyle/intern/geometry/GridHelpers.h @@ -144,7 +144,7 @@ inline bool insideProscenium (const real proscenium[4], const Polygon3r& polygon Vec3r triverts[3] = { Vec3r(polygon.getVertices()[0][0], polygon.getVertices()[0][1], 0.0), Vec3r(polygon.getVertices()[1][0], polygon.getVertices()[1][1], 0.0), - Vec3r(polygon.getVertices()[2][0], polygon.getVertices()[2][1], 0.0) + Vec3r(polygon.getVertices()[2][0], polygon.getVertices()[2][1], 0.0), }; return GeomUtils::overlapTriangleBox(boxCenter, boxHalfSize, triverts); } diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp index 0252a657ffc..011d18c57f9 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp @@ -263,7 +263,7 @@ static PyMethodDef module_functions[] = { ContextFunctions_read_directional_view_map_pixel___doc__}, {"get_selected_fedge", (PyCFunction)ContextFunctions_get_selected_fedge, METH_NOARGS, ContextFunctions_get_selected_fedge___doc__}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------ContextFunctions module definition--------------------------------*/ @@ -273,7 +273,7 @@ static PyModuleDef module_definition = { "Freestyle.ContextFunctions", module_docstring, -1, - module_functions + module_functions, }; //------------------- MODULE INITIALIZATION -------------------------------- diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index c6ed3dcf496..944599dcaf7 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -465,7 +465,7 @@ static PyMethodDef module_functions[] = { {"evaluateColorRamp", (PyCFunction) Freestyle_evaluateColorRamp, METH_VARARGS, Freestyle_evaluateColorRamp___doc__}, {"evaluateCurveMappingF", (PyCFunction) Freestyle_evaluateCurveMappingF, METH_VARARGS, Freestyle_evaluateCurveMappingF___doc__}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------Freestyle module definition---------------------------*/ @@ -475,7 +475,7 @@ static PyModuleDef module_definition = { "_freestyle", module_docstring, -1, - module_functions + module_functions, }; //-------------------MODULE INITIALIZATION-------------------------------- diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 1e637504991..1c8013273c2 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -295,7 +295,7 @@ static Mathutils_Callback FrsMaterial_mathutils_cb = { FrsMaterial_mathutils_get, FrsMaterial_mathutils_set, FrsMaterial_mathutils_get_index, - FrsMaterial_mathutils_set_index + FrsMaterial_mathutils_set_index, }; static unsigned char FrsMaterial_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp index 410e30d7f63..3d4e308c27e 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp @@ -285,7 +285,7 @@ static PyMethodDef BPy_FrsNoise_methods[] = { {"smoothNoise3", (PyCFunction)FrsNoise_smoothNoise3, METH_VARARGS | METH_KEYWORDS, FrsNoise_smoothNoise3_doc}, {"rand", (PyCFunction)FrsNoise_drand, METH_VARARGS | METH_KEYWORDS, NULL}, {"turbulence_smooth", (PyCFunction)FrsNoise_turbulence_smooth, METH_VARARGS | METH_KEYWORDS, NULL}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------BPy_FrsNoise type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp index 9fc47a473b7..18874db7251 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp @@ -105,7 +105,7 @@ PyDoc_STRVAR(module_docstring, "The Blender Freestyle.Integrator submodule\n\n") static PyMethodDef module_functions[] = { {"integrate", (PyCFunction) Integrator_integrate, METH_VARARGS | METH_KEYWORDS, Integrator_integrate_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------Integrator module definition--------------------------------------*/ @@ -115,7 +115,7 @@ static PyModuleDef module_definition = { "Freestyle.Integrator", module_docstring, -1, - module_functions + module_functions, }; /*-----------------------BPy_IntegrationType type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index dcdadc30d20..c2fe42c989c 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -143,7 +143,7 @@ static PyObject *Interface0D_get_fedge(BPy_Interface0D *self, PyObject *args, Py static PyMethodDef BPy_Interface0D_methods[] = { {"get_fedge", (PyCFunction)Interface0D_get_fedge, METH_VARARGS | METH_KEYWORDS, Interface0D_get_fedge_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------Interface1D get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index 8b440feb0b9..99da50ad063 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -210,7 +210,7 @@ static PyMethodDef BPy_Interface1D_methods[] = { {"vertices_end", (PyCFunction)Interface1D_vertices_end, METH_NOARGS, Interface1D_vertices_end_doc}, {"points_begin", (PyCFunction)Interface1D_points_begin, METH_VARARGS | METH_KEYWORDS, Interface1D_points_begin_doc}, {"points_end", (PyCFunction)Interface1D_points_end, METH_VARARGS | METH_KEYWORDS, Interface1D_points_end_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------Interface1D get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 540e957df41..de540a6df75 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -166,7 +166,7 @@ static PyObject *Iterator_decrement(BPy_Iterator *self) static PyMethodDef BPy_Iterator_methods[] = { {"increment", (PyCFunction) Iterator_increment, METH_NOARGS, Iterator_increment_doc}, {"decrement", (PyCFunction) Iterator_decrement, METH_NOARGS, Iterator_decrement_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------Iterator get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index 02c137e9cec..e9a861a0ce7 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -715,7 +715,7 @@ static PyMethodDef BPy_Operators_methods[] = { Operators_get_chains_size_doc}, {"get_strokes_size", (PyCFunction) Operators_get_strokes_size, METH_NOARGS | METH_STATIC, Operators_get_strokes_size_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------BPy_Operators type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index 3ce5e66f028..662f224b21e 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -148,7 +148,7 @@ static PyMethodDef BPy_SShape_methods[] = { {"add_edge", (PyCFunction)SShape_add_edge, METH_VARARGS | METH_KEYWORDS, SShape_add_edge_doc}, {"add_vertex", (PyCFunction)SShape_add_vertex, METH_VARARGS | METH_KEYWORDS, SShape_add_vertex_doc}, {"compute_bbox", (PyCFunction)SShape_compute_bbox, METH_NOARGS, SShape_compute_bbox_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------SShape get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index c2ac49bf32c..ad345af70c2 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -367,7 +367,7 @@ static PyMethodDef BPy_StrokeAttribute_methods[] = { StrokeAttribute_set_attribute_vec2_doc}, {"set_attribute_vec3", (PyCFunction) StrokeAttribute_set_attribute_vec3, METH_VARARGS | METH_KEYWORDS, StrokeAttribute_set_attribute_vec3_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------mathutils callbacks ----------------------------*/ @@ -475,7 +475,7 @@ static Mathutils_Callback StrokeAttribute_mathutils_cb = { StrokeAttribute_mathutils_get, StrokeAttribute_mathutils_set, StrokeAttribute_mathutils_get_index, - StrokeAttribute_mathutils_set_index + StrokeAttribute_mathutils_set_index, }; static unsigned char StrokeAttribute_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index 50d813aaa70..37a248fa02c 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -229,7 +229,7 @@ static PyObject *StrokeShader_shade(BPy_StrokeShader *self, PyObject *args, PyOb static PyMethodDef BPy_StrokeShader_methods[] = { {"shade", (PyCFunction)StrokeShader_shade, METH_VARARGS | METH_KEYWORDS, StrokeShader_shade___doc__}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------StrokeShader get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index d27c9cfd330..e3dc28c1745 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -133,7 +133,7 @@ static PyMethodDef BPy_ViewMap_methods[] = { ViewMap_get_closest_viewedge_doc}, {"get_closest_fedge", (PyCFunction)ViewMap_get_closest_fedge, METH_VARARGS | METH_KEYWORDS, ViewMap_get_closest_fedge_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ViewMap get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index bf7e385b91e..4c4b347b669 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -161,7 +161,7 @@ static PyObject *ViewShape_add_vertex(BPy_ViewShape *self, PyObject *args, PyObj static PyMethodDef BPy_ViewShape_methods[] = { {"add_edge", (PyCFunction)ViewShape_add_edge, METH_VARARGS | METH_KEYWORDS, ViewShape_add_edge_doc}, {"add_vertex", (PyCFunction)ViewShape_add_vertex, METH_VARARGS | METH_KEYWORDS, ViewShape_add_vertex_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ViewShape get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 3fdb9f1c692..6e22e529426 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -134,7 +134,7 @@ static PyObject *SVertex_add_fedge(BPy_SVertex *self, PyObject *args, PyObject * static PyMethodDef BPy_SVertex_methods[] = { {"add_normal", (PyCFunction)SVertex_add_normal, METH_VARARGS | METH_KEYWORDS, SVertex_add_normal_doc}, {"add_fedge", (PyCFunction)SVertex_add_fedge, METH_VARARGS | METH_KEYWORDS, SVertex_add_fedge_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------mathutils callbacks ----------------------------*/ @@ -249,7 +249,7 @@ static Mathutils_Callback SVertex_mathutils_cb = { SVertex_mathutils_get, SVertex_mathutils_set, SVertex_mathutils_get_index, - SVertex_mathutils_set_index + SVertex_mathutils_set_index, }; static unsigned char SVertex_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 557da01a306..0966b5582e1 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -117,7 +117,7 @@ static PyMethodDef BPy_ViewVertex_methods[] = { {"edges_end", (PyCFunction)ViewVertex_edges_end, METH_NOARGS, ViewVertex_edges_end_doc}, {"edges_iterator", (PyCFunction)ViewVertex_edges_iterator, METH_VARARGS | METH_KEYWORDS, ViewVertex_edges_iterator_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ViewVertex get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index d44be3c585f..e597f5761b9 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -207,7 +207,7 @@ static Mathutils_Callback StrokeVertex_mathutils_cb = { StrokeVertex_mathutils_get, StrokeVertex_mathutils_set, StrokeVertex_mathutils_get_index, - StrokeVertex_mathutils_set_index + StrokeVertex_mathutils_set_index, }; static unsigned char StrokeVertex_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index d9d0910d3e1..659f29fe132 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -113,7 +113,7 @@ static PyObject *TVertex_get_mate( BPy_TVertex *self, PyObject *args, PyObject * static PyMethodDef BPy_TVertex_methods[] = { {"get_svertex", (PyCFunction)TVertex_get_svertex, METH_VARARGS | METH_KEYWORDS, TVertex_get_svertex_doc}, {"get_mate", (PyCFunction)TVertex_get_mate, METH_VARARGS | METH_KEYWORDS, TVertex_get_mate_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------TVertex get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 45cd7f40169..37b609d1bd0 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -147,7 +147,7 @@ static PyMethodDef BPy_FrsCurve_methods[] = { FrsCurve_push_vertex_back_doc}, {"push_vertex_front", (PyCFunction)FrsCurve_push_vertex_front, METH_VARARGS | METH_KEYWORDS, FrsCurve_push_vertex_front_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------CurvePoint get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index fc6bbdf44d3..da08ace24f7 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -323,7 +323,7 @@ static PyMethodDef BPy_Stroke_methods[] = { {"stroke_vertices_end", (PyCFunction)Stroke_stroke_vertices_end, METH_NOARGS, Stroke_stroke_vertices_end_doc}, {"__reversed__", (PyCFunction)Stroke_reversed, METH_NOARGS, Stroke_reversed_doc}, {"stroke_vertices_size", (PyCFunction)Stroke_stroke_vertices_size, METH_NOARGS, Stroke_stroke_vertices_size_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------Stroke get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 0f743d1d689..eb9350d5c55 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -83,7 +83,7 @@ static PyObject *ViewEdge_update_fedges(BPy_ViewEdge *self) static PyMethodDef BPy_ViewEdge_methods[] = { {"update_fedges", (PyCFunction)ViewEdge_update_fedges, METH_NOARGS, ViewEdge_update_fedges_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ViewEdge get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp index dd36c76b5c7..a774ca5aeab 100644 --- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp @@ -143,7 +143,7 @@ static PyMethodDef BPy_Chain_methods[] = { Chain_push_viewedge_back_doc}, {"push_viewedge_front", (PyCFunction)Chain_push_viewedge_front, METH_VARARGS | METH_KEYWORDS, Chain_push_viewedge_front_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*-----------------------BPy_Chain type definition ------------------------------*/ diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 4fc8112b268..5712c1925da 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -201,7 +201,7 @@ static Mathutils_Callback FEdgeSharp_mathutils_cb = { FEdgeSharp_mathutils_get, FEdgeSharp_mathutils_set, FEdgeSharp_mathutils_get_index, - FEdgeSharp_mathutils_set_index + FEdgeSharp_mathutils_set_index, }; static unsigned char FEdgeSharp_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 358fc2587b4..796f319352e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -135,7 +135,7 @@ static Mathutils_Callback FEdgeSmooth_mathutils_cb = { FEdgeSmooth_mathutils_get, FEdgeSmooth_mathutils_set, FEdgeSmooth_mathutils_get_index, - FEdgeSmooth_mathutils_set_index + FEdgeSmooth_mathutils_set_index, }; static unsigned char FEdgeSmooth_mathutils_cb_index = -1; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index c0826fc4ec2..b68647d4a24 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -159,7 +159,7 @@ static PyObject *ChainingIterator_traverse(BPy_ChainingIterator *self, PyObject static PyMethodDef BPy_ChainingIterator_methods[] = { {"init", (PyCFunction) ChainingIterator_init, METH_NOARGS, ChainingIterator_init_doc}, {"traverse", (PyCFunction) ChainingIterator_traverse, METH_VARARGS | METH_KEYWORDS, ChainingIterator_traverse_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ChainingIterator get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index ae5bf483e95..6fc00741539 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -193,7 +193,7 @@ static PyMethodDef BPy_StrokeVertexIterator_methods[] = { {"incremented", (PyCFunction)StrokeVertexIterator_incremented, METH_NOARGS, StrokeVertexIterator_incremented_doc}, {"decremented", (PyCFunction)StrokeVertexIterator_decremented, METH_NOARGS, StrokeVertexIterator_decremented_doc}, {"reversed", (PyCFunction)StrokeVertexIterator_reversed, METH_NOARGS, StrokeVertexIterator_reversed_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------StrokeVertexIterator get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index 9b55335b1ba..10cd6493268 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -106,7 +106,7 @@ static PyObject *ViewEdgeIterator_change_orientation(BPy_ViewEdgeIterator *self) static PyMethodDef BPy_ViewEdgeIterator_methods[] = { {"change_orientation", (PyCFunction) ViewEdgeIterator_change_orientation, METH_NOARGS, ViewEdgeIterator_change_orientation_doc}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL}, }; /*----------------------ViewEdgeIterator get/setters ----------------------------*/ diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp index 5682dd24cb4..5469208070c 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp @@ -155,7 +155,7 @@ int ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait) Nature::EDGE_MARK, Nature::SUGGESTIVE_CONTOUR, Nature::VALLEY, - Nature::RIDGE + Nature::RIDGE, }; int numNatures = sizeof(natures) / sizeof(Nature::EdgeNature); for (int i = 0; i < numNatures; ++i) { diff --git a/source/blender/freestyle/intern/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp index 8e3be797a13..d6989037366 100644 --- a/source/blender/freestyle/intern/system/RandGen.cpp +++ b/source/blender/freestyle/intern/system/RandGen.cpp @@ -85,12 +85,12 @@ namespace Freestyle { static unsigned x[3] = { X0, X1, - X2 + X2, }; static unsigned a[3] = { A0, A1, - A2 + A2, }; static unsigned c = C; diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp index c46284634b5..4e42ff5a505 100644 --- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp @@ -40,19 +40,19 @@ real SilhouetteGeomEngine::_modelViewMatrix[4][4] = { {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, - {0, 0, 0, 1} + {0, 0, 0, 1}, }; real SilhouetteGeomEngine::_projectionMatrix[4][4] = { {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, - {0, 0, 0, 1} + {0, 0, 0, 1}, }; real SilhouetteGeomEngine::_transform[4][4] = { {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, - {0, 0, 0, 1} + {0, 0, 0, 1}, }; int SilhouetteGeomEngine::_viewport[4] = {1, 1, 1, 1}; real SilhouetteGeomEngine::_Focal = 0.0; @@ -61,13 +61,13 @@ real SilhouetteGeomEngine::_glProjectionMatrix[4][4] = { {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, - {0, 0, 0, 1} + {0, 0, 0, 1}, }; real SilhouetteGeomEngine::_glModelViewMatrix[4][4] = { {1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}, - {0, 0, 0, 1} + {0, 0, 0, 1}, }; real SilhouetteGeomEngine::_znear = 0.0; real SilhouetteGeomEngine::_zfar = 100.0; |