Merging r39652 through r39842 from trunk into vgroup_modifiers.

[blender-staging.git] / 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 613cfb8c3d65f7027b1c67694b2f80c9cea62a8a..bc55696672317eba8d593c49fbfe51b37ad8461b 100644 (file)
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id$
- *

  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or


@@ -927,13 +925,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                        case TSE_NLA_ACTION:
                                UI_icon_draw(x, y, ICON_ACTION); break;
                        case TSE_DRIVER_BASE:
                        case TSE_NLA_ACTION:
                                UI_icon_draw(x, y, ICON_ACTION); break;
                        case TSE_DRIVER_BASE:

-
-#if 0          // GSOC_PEPPER
-

                                UI_icon_draw(x, y, ICON_DRIVER); break;
                                UI_icon_draw(x, y, ICON_DRIVER); break;

-
-#endif         // GSOC_PEPPER
-

                        case TSE_DEFGROUP_BASE:
                                UI_icon_draw(x, y, ICON_GROUP_VERTEX); break;
                        case TSE_BONE:
                        case TSE_DEFGROUP_BASE:
                                UI_icon_draw(x, y, ICON_GROUP_VERTEX); break;
                        case TSE_BONE:


@@ -1096,14 +1088,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_FONT); break;
                        case OB_SURF: 
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_FONT); break;
                        case OB_SURF: 
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;

-
-#if 0          // GSOC_PEPPER
-

                        case OB_SPEAKER:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
                        case OB_SPEAKER:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;

-
-#endif         // GSOC_PEPPER
-

                        case OB_EMPTY: 
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
                
                        case OB_EMPTY: 
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
                


@@ -1147,15 +1133,9 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                tselem_draw_icon_uibut(&arg, ICON_TEXTURE_DATA); break;
                        case ID_IM:
                                tselem_draw_icon_uibut(&arg, ICON_IMAGE_DATA); break;
                                tselem_draw_icon_uibut(&arg, ICON_TEXTURE_DATA); break;
                        case ID_IM:
                                tselem_draw_icon_uibut(&arg, ICON_IMAGE_DATA); break;

-
-#if 0          // GSOC_PEPPER
-

                        case ID_SPK:
                        case ID_SO:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_SPEAKER); break;
                        case ID_SPK:
                        case ID_SO:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_SPEAKER); break;

-
-#endif         // GSOC_PEPPER
-

                        case ID_AR:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_ARMATURE); break;
                        case ID_CA:
                        case ID_AR:
                                tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_ARMATURE); break;
                        case ID_CA: