Outliner: Remove User Preferences
[blender.git] / source / blender / editors / space_outliner / outliner_draw.c
index c903a5026cfb803fd930fb2f2e3f9dc0f3976110..807a6555a01fb32cb4956a976f7ecb713898110b 100644 (file)
@@ -671,7 +671,7 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops
        }
 }
 
-static void outliner_draw_rnacols(ARegion *ar, int sizex)
+static void UNUSED_FUNCTION(outliner_draw_rnacols)(ARegion *ar, int sizex)
 {
        View2D *v2d = &ar->v2d;
 
@@ -697,6 +697,7 @@ static void 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;
@@ -741,6 +742,7 @@ 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)
 {
@@ -1788,7 +1790,7 @@ static void outliner_draw_tree(
 
        glBlendFunc(GL_SRC_ALPHA,  GL_ONE_MINUS_SRC_ALPHA); // only once
 
-       if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
+       if (soops->outlinevis == SO_DATABLOCKS) {
                /* struct marks */
                starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
                outliner_draw_struct_marks(ar, soops, &soops->tree, &starty);
@@ -1911,7 +1913,7 @@ void draw_outliner(const bContext *C)
        /* get extents of data */
        outliner_height(soops, &soops->tree, &sizey);
 
-       if (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
+       if (soops->outlinevis == SO_DATABLOCKS) {
                /* RNA has two columns:
                 *  - column 1 is (max_width + OL_RNA_COL_SPACEX) or
                 *                               (OL_RNA_COL_X), whichever is wider...
@@ -1958,13 +1960,8 @@ void draw_outliner(const bContext *C)
        outliner_back(ar);
        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 (ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
-               /* 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) {
+
+       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);