diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-30 10:32:14 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-30 10:32:14 +0300 |
commit | d6e8cd42325d763b65219c6652343a4a4c3a7489 (patch) | |
tree | 32e003dbc711302d3003560c9874f8312a0300fe /source/blender/editors/space_view3d | |
parent | 090807066c58943a817eaea74d7358534fad5070 (diff) |
2.5: fix compile error on mac, and a few warnings.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 8960ed7b8e4..fbf437e5599 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -231,7 +231,7 @@ void do_layer_buttons(bContext *C, short event) static void do_view3d_view_camerasmenu(bContext *C, void *arg, int event) { Scene *scene= CTX_data_scene(C); - View3D *v3d; + View3D *v3d= (View3D*)CTX_wm_space_data(C); Base *base; int i=1; diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 6464ed48b06..a06fb5a6741 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -854,7 +854,6 @@ static void mouse_select(bContext *C, short *mval, short modifier) unsigned int buffer[4*MAXPICKBUF]; int temp, a, dist=100; short hits; - short ctrl=0, shift=0, alt=0; /* always start list from basact in wire mode */ startbase= FIRSTBASE; @@ -1443,7 +1442,7 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event) view3d_operator_needs_opengl(C); - mouse_select(C, mval, NULL); + mouse_select(C, mval, 0); return OPERATOR_FINISHED; } |