[Bf-blender-cvs] [e89ac16ac0d] greasepencil-object: Fix: Data-Blocks view in Outliner no longer displayed property values, making it semi-useless

[Joshua Leung]

Commit: e89ac16ac0d036963a80bf3b3c105c1f11386558
Author: Joshua Leung
Date:   Thu Feb 8 16:13:55 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rBe89ac16ac0d036963a80bf3b3c105c1f11386558

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.

===================================================================

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 dfcd35782dd..ed3627e8ddd 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)
 {
@@ -1988,7 +1986,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);