From 19c2d34967fa64d5200e5ff381d198d12a3ba125 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 1 Oct 2004 07:51:12 +0000 Subject: - Improved memory system for pupmenu(), which now stores 255 entries max. Meaning menus come back to previous selection almost always. Also fixed annoying bug that caused Mirror menu (M in editmode) to start at 2nd item - New hotkey (test :) CTRL+TAB in editmode gives (and shows!) current selectmode. I prefer this over cycling, since the menu is informing you what happens. - To enforce pupmenus to start at specific item, use pupmenu_set_active() - pupmenu_col() to be done --- source/blender/src/toets.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'source/blender/src/toets.c') diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index 41991d44792..4d1af7ba5af 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -72,16 +72,17 @@ #include "BKE_scene.h" #include "BKE_utildefines.h" -#include "BIF_interface.h" -#include "BIF_screen.h" -#include "BIF_space.h" #include "BIF_butspace.h" -#include "BIF_renderwin.h" -#include "BIF_toolbox.h" -#include "BIF_toets.h" #include "BIF_editseq.h" #include "BIF_editsound.h" +#include "BIF_editmesh.h" +#include "BIF_interface.h" #include "BIF_poseobject.h" +#include "BIF_renderwin.h" +#include "BIF_screen.h" +#include "BIF_space.h" +#include "BIF_toets.h" +#include "BIF_toolbox.h" #include "BIF_usiblender.h" #include "BDR_vpaint.h" @@ -751,12 +752,16 @@ int blenderqread(unsigned short event, short val) } } else if(G.qual==LR_CTRLKEY){ - if(G.obpose) - exit_posemode(1); - else - enter_posemode(); - allqueue(REDRAWHEADERS, 0); - allqueue(REDRAWBUTSALL, 0); + Object *ob= OBACT; + if(ob) { + if(ob->type==OB_ARMATURE) { + if(G.obpose) exit_posemode(1); + else enter_posemode(); + } + else if(ob->type==OB_MESH) { + EM_selectmode_menu(); + } + } } else if(G.qual==LR_SHIFTKEY) { if(G.obedit) -- cgit v1.2.3