archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-01-18 08:59:41 +11:00
parent d3e856cdfc
commit 8efedf2523
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/alembic/intern/abc_exporter.cc
View File

@@ -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);

2
source/blender/blenlib/BLI_utildefines_stack.h
View File

@@ -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 */

4
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@@ -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,

6
source/blender/editors/space_graph/graph_draw.c
View File

@@ -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]);
}