[Bf-blender-cvs] [ae4f40ef6b8] greasepencil-edit-curve: GPencil: Fix compiler warnings
Antonio Vazquez
noreply at git.blender.org
Tue Jul 21 16:00:31 CEST 2020
Commit: ae4f40ef6b82d74bef6cd1c59cbda90c0f599642
Author: Antonio Vazquez
Date: Tue Jul 21 16:00:20 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBae4f40ef6b82d74bef6cd1c59cbda90c0f599642
GPencil: Fix compiler warnings
===================================================================
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_edit_curve.c
M source/blender/editors/gpencil/gpencil_select.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 51cb9dea743..406d7251ca5 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3063,7 +3063,6 @@ static int gpencil_snap_cursor_to_sel(bContext *C, wmOperator *UNUSED(op))
{
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Object *obact = CTX_data_active_object(C);
- Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact);
bGPdata *gpd = ED_gpencil_data_get_active(C);
const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd);
diff --git a/source/blender/editors/gpencil/gpencil_edit_curve.c b/source/blender/editors/gpencil/gpencil_edit_curve.c
index 64e5867309f..d6373e01d1e 100644
--- a/source/blender/editors/gpencil/gpencil_edit_curve.c
+++ b/source/blender/editors/gpencil/gpencil_edit_curve.c
@@ -156,12 +156,6 @@ static int gpencil_editcurve_set_handle_type_exec(bContext *C, wmOperator *op)
if (gpc_pt->flag & GP_CURVE_POINT_SELECT) {
BezTriple *bezt = &gpc_pt->bezt;
- bGPDcurve_point *gpc_pt_prev = (i > 0) ? &gpc->curve_points[i - 1] : NULL;
- bGPDcurve_point *gpc_pt_next = (i < gpc->tot_curve_points - 1) ?
- &gpc->curve_points[i + 1] :
- NULL;
- BezTriple *bezt_prev = gpc_pt_prev != NULL ? &gpc_pt_prev->bezt : NULL;
- BezTriple *bezt_next = gpc_pt_next != NULL ? &gpc_pt_next->bezt : NULL;
if (bezt->f2 & SELECT) {
bezt->h1 = handle_type;
diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 70e8649dd94..be46e6cae55 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -2464,7 +2464,6 @@ static int gpencil_select_vertex_color_exec(bContext *C, wmOperator *op)
ToolSettings *ts = CTX_data_tool_settings(C);
Object *ob = CTX_data_active_object(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
- const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd);
const float threshold = RNA_int_get(op->ptr, "threshold");
const int selectmode = gpencil_select_mode_from_vertex(ts->gpencil_selectmode_vertex);
More information about the Bf-blender-cvs
mailing list