Commit: 8efedf2523e859e844a84247b167807196c0958e
Author: Campbell Barton
Date: Fri Jan 18 08:59:41 2019 +1100
Branches: master
https://developer.blender.org/rB8efedf2523e859e844a84247b167807196c0958e
Cleanup: style
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/blenlib/BLI_utildefines_stack.h
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/editors/space_graph/graph_draw.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc
b/source/blender/alembic/intern/abc_exporter.cc
index a4b5963dd13..6ff572537a8 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -601,7 +601,8 @@ void AbcExporter::createShapeWriter(Object *ob, Object
*dupliObParent)
AbcObjectWriter *writer;
if (m_settings.curves_as_mesh) {
writer = new AbcCurveMeshWriter(ob, xform,
m_shape_sampling_index, m_settings);
- } else {
+ }
+ else {
writer = new AbcNurbsWriter(ob, xform,
m_shape_sampling_index, m_settings);
}
m_shapes.push_back(writer);
@@ -618,7 +619,8 @@ void AbcExporter::createShapeWriter(Object *ob, Object
*dupliObParent)
AbcObjectWriter *writer;
if (m_settings.curves_as_mesh) {
writer = new AbcCurveMeshWriter(ob, xform,
m_shape_sampling_index, m_settings);
- } else {
+ }
+ else {
writer = new AbcCurveWriter(ob, xform,
m_shape_sampling_index, m_settings);
}
m_shapes.push_back(writer);
diff --git a/source/blender/blenlib/BLI_utildefines_stack.h
b/source/blender/blenlib/BLI_utildefines_stack.h
index 224add91504..344d2c3c90e 100644
--- a/source/blender/blenlib/BLI_utildefines_stack.h
+++ b/source/blender/blenlib/BLI_utildefines_stack.h
@@ -25,7 +25,7 @@
* \ingroup bli
*
* Macro's for a simple array based stack
- * \note Caller handles alloc & free).
+ * \note Caller handles alloc & free.
*/
/* only validate array-bounds in debug mode */
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 2dd9c74d424..8c0b1dc3e9a 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -818,7 +818,7 @@ static void gpencil_draw_strokes(
/* stroke */
/* No fill strokes, must show stroke always */
if (((gp_style->flag & GP_STYLE_STROKE_SHOW) ||
- (gps->flag & GP_STROKE_NOFILL)) &&
+ (gps->flag & GP_STROKE_NOFILL)) &&
((gp_style->stroke_rgba[3] >
GPENCIL_ALPHA_OPACITY_THRESH) ||
(gpl->blend_mode == eGplBlendMode_Normal)))
{
@@ -1212,7 +1212,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data
*e_data, void *vedata, T
/* No fill strokes, must show stroke always */
if ((gp_style->flag & GP_STYLE_STROKE_SHOW) ||
- (gpd->runtime.sbuffer_sflag &
GP_STROKE_NOFILL))
+ (gpd->runtime.sbuffer_sflag &
GP_STROKE_NOFILL))
{
DRW_shgroup_call_add(
stl->g_data->shgrps_drawing_stroke,
diff --git a/source/blender/editors/space_graph/graph_draw.c
b/source/blender/editors/space_graph/graph_draw.c
index 0d3b55df531..26667b6edf7 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -246,8 +246,7 @@ static void draw_fcurve_selected_handle_vertices(FCurve
*fcu, View2D *v2d, bool
if (!sel_handle_only || BEZT_ISSEL_ANY(bezt)) {
if ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) ||
(prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
if ((bezt->f1 & SELECT) == sel
- /* && v2d->cur.xmin < bezt->vec[0][0] <
v2d->cur.xmax)*/
- )
+ /* && v2d->cur.xmin < bezt->vec[0][0] <
v2d->cur.xmax) */ )
{
immVertex2fv(pos, bezt->vec[0]);
}
@@ -255,8 +254,7 @@ static void draw_fcurve_selected_handle_vertices(FCurve
*fcu, View2D *v2d, bool
if (bezt->ipo == BEZT_IPO_BEZ) {
if ((bezt->f3 & SELECT) == sel
- /* && v2d->cur.xmin < bezt->vec[2][0] <
v2d->cur.xmax)*/
- )
+ /* && v2d->cur.xmin < bezt->vec[2][0] <
v2d->cur.xmax) */ )
{
immVertex2fv(pos, bezt->vec[2]);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
