diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-11-21 01:02:12 +0400 |
| commit | 2676f2d58f71f438008b413a86b873e7787d80ea (patch) | |
| tree | eb541972cf32d5958b7c0f7f8ece525b78cfcbff /source/blender/editors/include/UI_resources.h | |
| parent | bb9976f058ba2090812074e1b774213d20821a30 (diff) | |
| parent | 4ab1dadf72a821b344a714fff59aed11d15ecb14 (diff) | |
Merged changes in the trunk up to revision 42021.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 44eb136750b..e739417519f 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -320,6 +320,9 @@ void UI_ThemeClearColor(int colorid); // internal (blender) usage only, for init and set active void UI_SetTheme(int spacetype, int regionid); +// get current theme +struct bTheme *UI_GetTheme(void); + /* only for buttons in theme editor! */ const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); |