[Bf-blender-cvs] [1fb733ca74b] soc-2020-outliner: Don't swap tabs if properties editor is pinned
Nathan Craddock
noreply at git.blender.org
Thu Jun 18 04:51:49 CEST 2020
Commit: 1fb733ca74b160a1409fbcd888f81972061ea12d
Author: Nathan Craddock
Date: Wed Jun 17 14:30:47 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB1fb733ca74b160a1409fbcd888f81972061ea12d
Don't swap tabs if properties editor is pinned
===================================================================
M 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 3d35c83f908..f563bed3fdd 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -111,8 +111,11 @@ void ED_buttons_set_context(const bContext *C, const short context)
if (sl->spacetype == SPACE_PROPERTIES) {
SpaceProperties *sbuts = (SpaceProperties *)sl;
- sbuts->mainbuser = context;
- sbuts->mainb = sbuts->mainbuser;
+
+ if (!sbuts->pinid) {
+ sbuts->mainbuser = context;
+ sbuts->mainb = sbuts->mainbuser;
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list