[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41974] trunk/blender: UI: small tweak to tooltips for enum menus, it wasn't very clear which

[Brecht Van Lommel]

Revision: 41974
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41974
Author:   blendix
Date:     2011-11-18 21:06:36 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
UI: small tweak to tooltips for enum menus, it wasn't very clear which
description was for the property and which for the item.

Modified Paths:
--------------
    trunk/blender/intern/cycles/CMakeLists.txt
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt	2011-11-18 20:55:06 UTC (rev 41973)
+++ trunk/blender/intern/cycles/CMakeLists.txt	2011-11-18 21:06:36 UTC (rev 41974)
@@ -61,8 +61,8 @@
 # Subdirectories
 
 if(WITH_CYCLES_BLENDER)
+	add_definitions(-DBLENDER_PLUGIN)
 	add_subdirectory(blender)
-	add_definitions(-DBLENDER_PLUGIN)
 endif(WITH_CYCLES_BLENDER)
 
 add_subdirectory(app)

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2011-11-18 20:55:06 UTC (rev 41973)
+++ trunk/blender/source/blender/editors/interface/interface.c	2011-11-18 21:06:36 UTC (rev 41974)
@@ -2618,11 +2618,8 @@
 				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);

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2011-11-18 20:55:06 UTC (rev 41973)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2011-11-18 21:06:36 UTC (rev 41974)
@@ -376,7 +376,7 @@
 			data->totline++;
 		}
 
-		if(but->type == ROW) {
+		if(ELEM(but->type, ROW, MENU)) {
 			EnumPropertyItem *item;
 			int i, totitem, free;
 
@@ -386,7 +386,7 @@
 				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;