diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-19 21:14:14 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:05 +0300 |
commit | 4ff68d031d3a22e13125f3eadaf18808da52a99a (patch) | |
tree | caa83ed93f1099f872c961a1ee8a06d33baa5b77 /source/blender/editors | |
parent | a351e8b6ef81f07b400cf2b7389f8ac1c7bb7e6b (diff) |
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
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 1 |
2 files changed, 2 insertions, 1 deletions
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); diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index c0517cf1151..1cd5c5453c2 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -52,6 +52,7 @@ struct SimDebugData; struct wmNDOFMotionData; struct wmOperatorType; struct wmWindowManager; +struct wmKeyConfig; /* drawing flags: */ enum { |