archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Tweaked the logic of the Fkey button cycling to make it a bit smarter

Browse Source
This commit is contained in:
Matt Ebb
2005-11-24 17:55:46 +00:00
parent db31007e32
commit 9c66d202fe
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/src/space.c
View File

@@ -3334,12 +3334,9 @@ void extern_set_butspace(int fkey)
else if (sbuts->tab[CONTEXT_SHADING]==TAB_SHADING_WORLD) else if (sbuts->tab[CONTEXT_SHADING]==TAB_SHADING_WORLD)
sbuts->tab[CONTEXT_SHADING]=TAB_SHADING_LAMP; sbuts->tab[CONTEXT_SHADING]=TAB_SHADING_LAMP;
} }
else if (sbuts->oldkeypress == F6KEY) { /* if we're coming in from texture buttons,
sbuts->tab[CONTEXT_SHADING]=TAB_SHADING_MAT; or from outside the shading context, just go to the 'default' */
} else if ((OBACT && sbuts->mainb!= CONTEXT_SHADING) || (sbuts->oldkeypress == F6KEY)) {
/* if we're coming in from outside the shading context, just go to the 'default' */
else if(OBACT && sbuts->mainb!= CONTEXT_SHADING) {
sbuts->mainb= CONTEXT_SHADING; sbuts->mainb= CONTEXT_SHADING;
if(OBACT->type==OB_CAMERA) if(OBACT->type==OB_CAMERA)