diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-24 14:08:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-24 14:08:07 +0400 |
commit | ace1c998c42263712bccbce5e2942aecdc8c592e (patch) | |
tree | ddd7dcb16f9e14ac9a59fdba6ba27748b3fa2432 /source/blender/editors/space_sequencer | |
parent | 39c0e690d3ad350195c8c68b7a8d317d056ff6a0 (diff) |
warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_select.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index de0b048e9d5..7f95c1cb270 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -79,11 +79,11 @@ //static Sequence *_last_seq=0; //static int _last_seq_init=0; /* XXX */ -static void error() {} +static void error(const char *dummy) {} static void waitcursor(int val) {} -static void activate_fileselect() {} -static int pupmenu() {return 0;} -static int okee() {return 0;} +static void activate_fileselect(int d1, char *d2, char *d3, void *d4) {} +static int pupmenu(const char *dummy) {return 0;} +static int okee(const char *dummy) {return 0;} /* XXX */ diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 1074c3572fc..a49394d3a12 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -64,8 +64,7 @@ /* own include */ #include "sequencer_intern.h" -static void *find_nearest_marker() {return NULL;} -static void deselect_markers() {} +static void *find_nearest_marker(int d1, int d2) {return NULL;} void select_surrounding_handles(Scene *scene, Sequence *test) /* XXX BRING BACK */ { @@ -349,7 +348,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event) marker->flag |= SELECT; } else { - deselect_markers(0, 0); + /* deselect_markers(0, 0); */ /* XXX, in 2.4x, seq selection used to deselect all, need to re-thnik this for 2.5 */ marker->flag |= SELECT; } |