[Bf-blender-cvs] [ec57e6c7907] soc-2020-outliner: Outliner: Fix crash opening scenes view
Nathan Craddock
noreply at git.blender.org
Thu Jul 30 04:45:10 CEST 2020
Commit: ec57e6c79075449beb8a38419fe9d0f149853a34
Author: Nathan Craddock
Date: Wed Jul 29 19:45:00 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBec57e6c79075449beb8a38419fe9d0f149853a34
Outliner: Fix crash opening scenes view
The collection enable box should only show in scenes view.
===================================================================
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 6d83b0df2a0..6b68f1c3a4b 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1046,7 +1046,7 @@ static void outliner_draw_restrictbuts(uiBlock *block,
if (soops->show_restrict_flags & SO_RESTRICT_SELECT) {
restrict_offsets.select = (++restrict_column_offset) * UI_UNIT_X + V2D_SCROLL_WIDTH;
}
- if (soops->show_restrict_flags & SO_RESTRICT_ENABLE) {
+ if (soops->outlinevis == SO_VIEW_LAYER && soops->show_restrict_flags & SO_RESTRICT_ENABLE) {
restrict_offsets.enable = (++restrict_column_offset) * UI_UNIT_X + V2D_SCROLL_WIDTH;
}
More information about the Bf-blender-cvs
mailing list