diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
commit | d433cd65f7127d60e17d05a824290423ad226eae (patch) | |
tree | f0a9c821f6046e97b74c6969d41269b558fd52ab /source/blender/editors/include/UI_resources.h | |
parent | 10f0f66560234a04aed3295c74fff20adacbc57f (diff) | |
parent | f10dea7e3b9b431edae9c787fa1a9e09cd567ed7 (diff) |
Merged changes in the trunk up to revision 53146.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 7391d29c9bf..a43e1705101 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -64,10 +64,11 @@ enum { TH_HEADER_TEXT, TH_HEADER_TEXT_HI, - /* float panels */ - TH_PANEL, - TH_PANEL_TEXT, - TH_PANEL_TEXT_HI, + /* panels */ + TH_PANEL_HEADER, + TH_PANEL_BACK, + TH_PANEL_SHOW_HEADER, + TH_PANEL_SHOW_BACK, TH_BUTBACK, TH_BUTBACK_TEXT, |