[Bf-blender-cvs] [514db9f] master: UI: Remove 'x' icon from paths and lists

[Julian Eisel]

Commit: 514db9f014110da442f13c5a84f9e895dabbf305
Author: Julian Eisel
Date:   Tue Nov 29 23:41:20 2016 +0100
Branches: master
https://developer.blender.org/rB514db9f014110da442f13c5a84f9e895dabbf305

UI: Remove 'x' icon from paths and lists

===================================================================

M	source/blender/editors/interface/interface_utils.c

===================================================================

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index f4df3d4..8dfbbdd 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -119,7 +119,10 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			else
 				but = uiDefButR_prop(block, UI_BTYPE_TEXT, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
 
-			UI_but_flag_enable(but, UI_BUT_VALUE_CLEAR); /* might want to make this optional? */
+			PropertySubType subtype = RNA_property_subtype(prop);
+			if (!(ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME) || (block->flag & UI_BLOCK_LIST_ITEM))) {
+				UI_but_flag_enable(but, UI_BUT_VALUE_CLEAR);
+			}
 			if (RNA_property_flag(prop) & PROP_TEXTEDIT_UPDATE) {
 				UI_but_flag_enable(but, UI_BUT_TEXTEDIT_UPDATE);
 			}