diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-02-08 06:15:49 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-02-08 06:15:49 +0300 |
| commit | 8fa19e195036c2792046d91ad106dec6460e65a5 (patch) | |
| tree | f4178b0f98d8f2301e35b2997e3bab76166d4cc6 | |
| parent | 42c99ee5f518fa036439af297416e135bc58b806 (diff) | |
Fix: Data-Blocks view in Outliner no longer displayed property values, making it semi-useless
Partially revert efe1af3d11a930b539718cc566049f07316427ff
The offending commit over-zealously removed the datablocks viewer case
as well, when only the condition needed to be modified.
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 82441536699..3908cdaad0c 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -671,7 +671,7 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops } } -static void UNUSED_FUNCTION(outliner_draw_rnacols)(ARegion *ar, int sizex) +static void outliner_draw_rnacols(ARegion *ar, int sizex) { View2D *v2d = &ar->v2d; @@ -697,7 +697,6 @@ static void UNUSED_FUNCTION(outliner_draw_rnacols)(ARegion *ar, int sizex) immUnbindProgram(); } -#if 0 static void outliner_draw_rnabuts(uiBlock *block, ARegion *ar, SpaceOops *soops, int sizex, ListBase *lb) { TreeElement *te; @@ -742,7 +741,6 @@ static void outliner_draw_rnabuts(uiBlock *block, ARegion *ar, SpaceOops *soops, UI_block_emboss_set(block, UI_EMBOSS); } -#endif static void outliner_buttons(const bContext *C, uiBlock *block, ARegion *ar, TreeElement *te) { @@ -1959,7 +1957,12 @@ void draw_outliner(const bContext *C) block = UI_block_begin(C, ar, __func__, UI_EMBOSS); outliner_draw_tree((bContext *)C, block, scene, view_layer, ar, soops, has_restrict_icons, &te_edit); - if ((soops->outlinevis == SO_ID_ORPHANS) && has_restrict_icons) { + if (soops->outlinevis, SO_DATABLOCKS) { + /* draw rna buttons */ + outliner_draw_rnacols(ar, sizex_rna); + outliner_draw_rnabuts(block, ar, soops, sizex_rna, &soops->tree); + } + else if ((soops->outlinevis == SO_ID_ORPHANS) && has_restrict_icons) { /* draw user toggle columns */ outliner_draw_restrictcols(ar); outliner_draw_userbuts(block, ar, soops, &soops->tree); |