From 4ff68d031d3a22e13125f3eadaf18808da52a99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 19 Jan 2015 19:14:14 +0100 Subject: Fix for warnings/errors Conflicts: source/blender/blenkernel/intern/key.c source/blender/blenkernel/intern/particle_system.c source/blender/makesrna/intern/rna_particle.c --- source/blender/editors/physics/particle_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/physics/particle_edit.c') diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index b739f1572c1..2c3280a3659 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4151,7 +4151,7 @@ static void shape_cut(PEData *data, int pa_index) } } -static int shape_cut_exec(bContext *C, wmOperator *op) +static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); -- cgit v1.2.3