diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/intern/mesh_intersect.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_select.c | 9 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 3929cc12198..4eff3c52e63 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -696,7 +696,7 @@ void IMesh::remove_null_faces() { int64_t nullcount = 0; for (Face *f : this->face_) { - if (f == NULL) { + if (f == nullptr) { ++nullcount; } } diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index ddd8a11d9b5..2c0b9534141 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -2279,12 +2279,15 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) if (toggle) { if (hit_curve_point != NULL) { BezTriple *bezt = &hit_curve_point->bezt; - if (bezt->f1 & SELECT && hit_curve_handle == 0) + if ((bezt->f1 & SELECT) && (hit_curve_handle == 0)) { deselect = true; - if (bezt->f2 & SELECT && hit_curve_handle == 1) + } + if ((bezt->f2 & SELECT) && (hit_curve_handle == 1)) { deselect = true; - if (bezt->f3 & SELECT && hit_curve_handle == 2) + } + if ((bezt->f3 & SELECT) && (hit_curve_handle == 2)) { deselect = true; + } } else { deselect = (hit_point->flag & GP_SPOINT_SELECT) != 0; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 19aa3b69bbb..76a584fcac1 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -2250,7 +2250,7 @@ static void gpencil_insert_point(bGPdata *gpd, bGPDspoint *a_pt, bGPDspoint *b_pt, const float co_a[3], - float co_b[3]) + const float co_b[3]) { bGPDspoint *temp_points; int totnewpoints, oldtotpoints; |