diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-09-05 21:06:09 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-09-05 21:06:09 +0400 |
commit | 42faf7ae41d807c2f9a94f40b774038af0c065ec (patch) | |
tree | 8460e4d70cf287da04b656748297521d0d3ef381 /source/blender/editors/space_outliner/outliner_draw.c | |
parent | 79ef35889f850aa7173800bcf67918c14f3b1291 (diff) | |
parent | 59dbd53e72ae25edf247e49ea1e291af277fecc4 (diff) |
Merge with trunk r39928
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 83b617973be..7df15fb5703 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 @@ -238,7 +236,7 @@ static int group_select_flag(Group *gr) return 0; } -static void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag) +void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag) { Scene *scene = (Scene *)poin; GroupObject *gob; @@ -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: @@ -1094,14 +1086,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; @@ -1145,15 +1131,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: |