Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2009-05-04 11:04:48 +0400
committerMatt Ebb <matt@mke3.net>2009-05-04 11:04:48 +0400
commit387df32933996850145487ddba07a3bd3c25d627 (patch)
tree9ad498f355985163b59d99264e752870f75c4e3c /source/blender/editors/space_buttons
parent2e93dc4037b815a97c9b9d03fe28742e01458e43 (diff)
* Icon updates and fixes
* Made the buttons space listen to and update for new active objects * Cleaned up the Add Object menu
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r--source/blender/editors/space_buttons/buttons_header.c20
-rw-r--r--source/blender/editors/space_buttons/space_buttons.c1
2 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index 50fb24c8ac4..ca8787f0c48 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -156,16 +156,16 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
if(ob) {
switch(ob->type) {
- case OB_EMPTY: dataicon= ICON_OUTLINER_OB_EMPTY; break;
- case OB_MESH: dataicon= ICON_OUTLINER_OB_MESH; break;
- case OB_CURVE: dataicon= ICON_OUTLINER_OB_CURVE; break;
- case OB_SURF: dataicon= ICON_OUTLINER_OB_SURFACE; break;
- case OB_FONT: dataicon= ICON_OUTLINER_OB_FONT; break;
- case OB_MBALL: dataicon= ICON_OUTLINER_OB_META; break;
- case OB_LAMP: dataicon= ICON_OUTLINER_OB_LAMP; break;
- case OB_CAMERA: dataicon= ICON_OUTLINER_OB_CAMERA; break;
- case OB_LATTICE: dataicon= ICON_OUTLINER_OB_LATTICE; break;
- case OB_ARMATURE: dataicon= ICON_OUTLINER_OB_ARMATURE; break;
+ case OB_EMPTY: dataicon= ICON_EMPTY_DATA; break;
+ case OB_MESH: dataicon= ICON_MESH_DATA; break;
+ case OB_CURVE: dataicon= ICON_CURVE_DATA; break;
+ case OB_SURF: dataicon= ICON_SURFACE_DATA; break;
+ case OB_FONT: dataicon= ICON_FONT_DATA; break;
+ case OB_MBALL: dataicon= ICON_META_DATA; break;
+ case OB_LAMP: dataicon= ICON_LAMP_DATA; break;
+ case OB_CAMERA: dataicon= ICON_CAMERA_DATA; break;
+ case OB_LATTICE: dataicon= ICON_LATTICE_DATA; break;
+ case OB_ARMATURE: dataicon= ICON_ARMATURE_DATA; break;
default: break;
}
}
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 3cbf060905a..2013c3d72a9 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -237,6 +237,7 @@ static void buttons_area_listener(ARegion *ar, wmNotifier *wmn)
case NC_SCENE:
switch(wmn->data) {
case ND_FRAME:
+ case ND_OB_ACTIVE:
ED_region_tag_redraw(ar);
break;
}