diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-24 14:29:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-24 14:29:26 +0400 |
| commit | 1f7ae143a29b090ed97cdd7eb47a9c2dbd7f72a2 (patch) | |
| tree | fff560080a8bbf37ee087653df1b8a30173537b1 /source/blender/editors/space_buttons/space_buttons.c | |
| parent | d38ba6b5d25ca42f76b6d1b746217a565f26228f (diff) | |
| parent | 74c9c24d273863319a55c18234e03b7d27a43a87 (diff) | |
Merged changes in the trunk up to revision 48227.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
Diffstat (limited to 'source/blender/editors/space_buttons/space_buttons.c')
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index d1737fcd065..c894c1a980b 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -333,6 +333,9 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn) buttons_area_redraw(sa, BCONTEXT_DATA); sbuts->preview = 1; break; + case NC_GROUP: + buttons_area_redraw(sa, BCONTEXT_OBJECT); + break; case NC_BRUSH: buttons_area_redraw(sa, BCONTEXT_TEXTURE); break; |