2.5: Various Fixes

[blender-staging.git] / source / blender / editors / space_buttons / buttons_context.c

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 1ebab105086d04dc6e7a8a057e3da8608ef1e460..3a3f5bd83eeaebe7dfa16aa02e6c2b37c07e0761 100644 (file)
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -457,6 +457,11 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
                }
        }
 
+       /* always try to use the tab that was explicitly
+        * set to the user, so that once that context comes
+        * back, the tab is activated again */
+       sbuts->mainb= sbuts->mainbuser;
+
        /* in case something becomes invalid, change */
        if((flag & (1 << sbuts->mainb)) == 0) {
                if(flag & BCONTEXT_OBJECT) {