X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/blobdiff_plain/e89046907327228fe0c8e5f554341d791e0fe0a5..e4fd20c20c6a64678e7fe3907f795f527498414f:/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 613cfb8c3d6..bc556966723 100644
--- 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
@@ -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:
-
-#if 0		// GSOC_PEPPER
-
 				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:
@@ -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;
-
-#if 0		// GSOC_PEPPER
-
 			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;
 		
@@ -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;
-
-#if 0		// GSOC_PEPPER
-
 			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: