archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

use ICON_NULL define rather then 0, makes UI calls less confusing. (no functional change)

Browse Source 
eg: uiItemR(row, &dvar_ptr, "type", 0, "", 0); -> uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NULL);
This commit is contained in:
Campbell Barton
2010-12-23 02:43:40 +00:00
parent f0951e86ee
commit 86b89af5dd
46 changed files with 853 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_utils.c
View File

@@ -151,12 +151,12 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper
if(label_align=='V') {
col= uiLayoutColumn(layout, 1);
uiItemL(col, name, 0);
uiItemL(col, name, ICON_NULL);
}
else if(label_align=='H') {
split = uiLayoutSplit(layout, 0.5f, 0);
uiItemL(uiLayoutColumn(split, 0), name, 0);
uiItemL(uiLayoutColumn(split, 0), name, ICON_NULL);
col= uiLayoutColumn(split, 0);
}
else {
@@ -177,7 +177,7 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper
name= NULL; /* no smart label alignment, show default name with button */
}
uiItemFullR(col, ptr, prop, -1, 0, 0, name, 0);
uiItemFullR(col, ptr, prop, -1, 0, 0, name, ICON_NULL);
tot++;
}
RNA_STRUCT_END;
@@ -194,7 +194,7 @@ int uiIconFromID(ID *id)
short idcode;
if(id==NULL)
return 0;
return ICON_NULL;
idcode= GS(id->name);
@@ -212,5 +212,5 @@ int uiIconFromID(ID *id)
will set the right type, also with subclassing */
RNA_id_pointer_create(id, &ptr);
return (ptr.type)? RNA_struct_ui_icon(ptr.type): 0;
return (ptr.type)? RNA_struct_ui_icon(ptr.type) : ICON_NULL;
}