diff options
author | Ton Roosendaal <ton@blender.org> | 2008-11-29 18:10:31 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-11-29 18:10:31 +0300 |
commit | 78218d89d68861cf96884ce6553ea587b4f6eeb4 (patch) | |
tree | 2189de563ae91e91c1b37a3cb3632b45f7b5ce96 /source/blender/editors/include | |
parent | f07f6f6fa0f7bef70c76a1a8e1eab65ecf501804 (diff) |
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_markers.h | 7 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 6 | ||||
-rw-r--r-- | source/blender/editors/include/ED_screen.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_util.h | 34 |
4 files changed, 40 insertions, 8 deletions
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index 09346417d5a..cad985ce37c 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -36,13 +36,10 @@ enum { -struct wmOperatorType; - - void draw_markers_time(const bContext *C, int flag); -/* operators */ -void ED_MARKER_OT_add(struct wmOperatorType *ot); +/* register operators, called in ED_operatortypes_screen() */ +void ED_marker_operatortypes(void); #endif /* ED_MARKERS_H */ diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index be47fb6f2d0..882ced8a27b 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -25,9 +25,9 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef ED_AREA_H -#define ED_AREA_H +#ifndef ED_MESH_H +#define ED_MESH_H -#endif /* ED_AREA_H */ +#endif /* ED_MESH_H */ diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 01fac210a14..a8e39f51ed4 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -43,6 +43,7 @@ void ED_region_do_listen(ARegion *ar, struct wmNotifier *note); void ED_region_do_draw(struct bContext *C, ARegion *ar); void ED_region_do_refresh(struct bContext *C, ARegion *ar); void ED_region_exit(struct bContext *C, ARegion *ar); +void ED_region_pixelspace(struct bContext *C, ARegion *ar); /* spaces */ void ED_spacetypes_init(void); diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h new file mode 100644 index 00000000000..57b6a0f52d0 --- /dev/null +++ b/source/blender/editors/include/ED_util.h @@ -0,0 +1,34 @@ +/** + * $Id: + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ +#ifndef ED_UTIL_H +#define ED_UTIL_H + +void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert); + +#endif /* ED_UTIL_H */ + |