From efe1af3d11a930b539718cc566049f07316427ff Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 19 Jan 2018 15:44:26 -0200 Subject: Outliner: Remove User Preferences This was introduced to the outliner when we had no User Preference window back in 2.5x. Right now it makes no sense to keep this around. But how about addon user preferences: * They belong in the user preference window under the addon. How about the user preferences themselves: * You find them in the user preference window. And templates? * Why are they here in the first place? After talking to Pablo Vazquez (who in turn poked Sergey Sharybin) we found it reasonable to get rid of this. If it turns out that we were wrong we revert this. As for leaving this exposed as a debug option (as suggested on IRC) I would say no, please. This end up polluting the code and never cleaned up in the end. (this was specific talking about templates). Technical note: I left the functions in outliner still hanging around. While I used UNUSED_FUNCTION for one of them, for the other one I had to use: `#if 0` because the function was calling itself, which would fail to build if I used UNUSED_FUNCTION. --- source/blender/editors/space_outliner/outliner_select.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_outliner/outliner_select.c') diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index e13177a862a..b9222e62bb0 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -1005,7 +1005,7 @@ static bool outliner_item_is_co_within_close_toggle(TreeElement *te, float view_ static bool outliner_is_co_within_restrict_columns(const SpaceOops *soops, const ARegion *ar, float view_co_x) { - return (!ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF) && + return ((soops->outlinevis != SO_DATABLOCKS) && !(soops->flag & SO_HIDE_RESTRICTCOLS) && (view_co_x > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX)); } -- cgit v1.2.3