diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-19 01:06:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-19 01:06:36 +0400 |
| commit | c26c5f38529fd490638aa4b8a8070715ecf4a3fc (patch) | |
| tree | 99ff3b540d79946bd49c79def13fd5dad1e2d583 | |
| parent | 97808449e617661f0a08677083ef4d6bc692e6d3 (diff) | |
UI: small tweak to tooltips for enum menus, it wasn't very clear which
description was for the property and which for the item.
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 2a7a6f4ca65..a85b2ba8c2a 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -61,8 +61,8 @@ include_directories( # Subdirectories if(WITH_CYCLES_BLENDER) - add_subdirectory(blender) add_definitions(-DBLENDER_PLUGIN) + add_subdirectory(blender) endif(WITH_CYCLES_BLENDER) add_subdirectory(app) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index b34b56f31ed..4b7adbc1064 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2618,11 +2618,8 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s else BLI_dynstr_appendf(dynstr, "|%s %%x%d", item[i].name, item[i].value); - if(value == item[i].value) { + if(value == item[i].value) icon= item[i].icon; - if(!tip) - tip= item[i].description; - } } str= BLI_dynstr_get_cstring(dynstr); BLI_dynstr_free(dynstr); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 513f084b6e8..93e974ddb20 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -376,7 +376,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) data->totline++; } - if(but->type == ROW) { + if(ELEM(but->type, ROW, MENU)) { EnumPropertyItem *item; int i, totitem, free; @@ -386,7 +386,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) if(item[i].identifier[0] && item[i].value == (int)but->hardmax) { if(item[i].description[0]) { BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "%s: %s", item[i].name, item[i].description); - data->color[data->totline]= 0xFFFFFF; + data->color[data->totline]= 0xDDDDDD; data->totline++; } break; |