archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Speaker Object icons, thanks Phil Gosch.

Browse Source
This commit is contained in:
Joerg Mueller
2011-08-03 13:34:49 +00:00
parent eb9d591898
commit fde1dc0fb2
6 changed files with 6737 additions and 6665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blenderbuttons
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 210 KiB

2
release/scripts/startup/bl_ui/space_info.py
View File

@@ -287,7 +287,7 @@ class INFO_MT_add(bpy.types.Menu):
layout.operator("object.add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'EMPTY'
layout.separator()
layout.operator("object.speaker_add", text="Speaker", icon='SPEAKER')
layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER')
layout.separator()
layout.operator("object.camera_add", text="Camera", icon='OUTLINER_OB_CAMERA')

2
source/blender/editors/animation/anim_channels_defines.c
View File

@@ -608,7 +608,7 @@ static int acf_object_icon(bAnimListElem *ale)
case OB_LATTICE:
return ICON_OUTLINER_OB_LATTICE;
case OB_SPEAKER:
return ICON_SPEAKER;
return ICON_OUTLINER_OB_SPEAKER;
case OB_ARMATURE:
return ICON_OUTLINER_OB_ARMATURE;
case OB_FONT:

13390
source/blender/editors/datafiles/blenderbuttons.c
View File

File diff suppressed because it is too large Load Diff

4
source/blender/editors/include/UI_icons.h
View File

@@ -322,8 +322,8 @@ DEF_ICON(OUTLINER_OB_CAMERA)
DEF_ICON(OUTLINER_OB_ARMATURE)
DEF_ICON(OUTLINER_OB_FONT)
DEF_ICON(OUTLINER_OB_SURFACE)
DEF_ICON(OUTLINER_OB_SPEAKER)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK119)
DEF_ICON(BLANK120)
DEF_ICON(BLANK121)
DEF_ICON(BLANK122)
@@ -354,9 +354,9 @@ DEF_ICON(OUTLINER_DATA_CAMERA)
DEF_ICON(OUTLINER_DATA_ARMATURE)
DEF_ICON(OUTLINER_DATA_FONT)
DEF_ICON(OUTLINER_DATA_SURFACE)
DEF_ICON(OUTLINER_DATA_SPEAKER)
DEF_ICON(OUTLINER_DATA_POSE)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK129)
DEF_ICON(BLANK130)
DEF_ICON(BLANK131)
DEF_ICON(BLANK132)

4
source/blender/editors/space_outliner/outliner_draw.c
View File

@@ -1081,7 +1081,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case OB_SURF:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
case OB_SPEAKER:
tselem_draw_icon_uibut(&arg, ICON_SPEAKER); break;
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
case OB_EMPTY:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
@@ -1127,7 +1127,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
tselem_draw_icon_uibut(&arg, ICON_IMAGE_DATA); break;
case ID_SPK:
case ID_SO:
tselem_draw_icon_uibut(&arg, ICON_SPEAKER); break;
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_SPEAKER); break;
case ID_AR:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_ARMATURE); break;
case ID_CA: