Commit: 9390b2e645a69ce0b4d50177d4fa8775b770afe4
Author: Campbell Barton
Date: Mon Jan 14 11:42:28 2019 +1100
Branches: master
https://developer.blender.org/rB9390b2e645a69ce0b4d50177d4fa8775b770afe4
Cleanup: compiler warnings
===================================================================
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_utils.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_edit.c
b/source/blender/editors/gpencil/gpencil_edit.c
index 45653ac69df..72f65ce8a37 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3850,7 +3850,7 @@ static void gpencil_cutter_dissolve(bGPDlayer *hit_layer,
bGPDstroke *hit_stroke
}
/* if all points selected delete or only 2 points and 1 selected */
- if ((totselect == 1) && (hit_stroke->totpoints == 2) ||
+ if (((totselect == 1) && (hit_stroke->totpoints == 2)) ||
(hit_stroke->totpoints == totselect))
{
BLI_remlink(&hit_layer->actframe->strokes, hit_stroke);
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index 232f3b8f606..36ae1a211d3 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -2052,7 +2052,7 @@ static bool gpencil_check_collision(
return hit;
}
-void static gp_copy_points(
+static void gp_copy_points(
bGPDstroke *gps, bGPDspoint *pt, bGPDspoint *pt_final, int i, int i2)
{
copy_v3_v3(&pt_final->x, &pt->x);
@@ -2073,7 +2073,7 @@ void static gp_copy_points(
}
-void static gp_insert_point(
+static void gp_insert_point(
bGPDstroke *gps,
bGPDspoint *a_pt, bGPDspoint *b_pt,
float co_a[3], float co_b[3])
@@ -2182,7 +2182,6 @@ int ED_gpencil_select_stroke_segment(
/* Save list of strokes to check */
int totstrokes = 0;
for (bGPDstroke *gps_iter = gpf->strokes.first; gps_iter; gps_iter =
gps_iter->next) {
-
if (gps_iter->totpoints < 2) {
continue;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
