merge with trunk r39834

This commit is contained in:
Xiao Xiangquan
2011-09-01 15:08:32 +00:00
812 changed files with 52148 additions and 36243 deletions

View File

@@ -145,7 +145,7 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper
if(label_align != '\0') {
PropertyType type = RNA_property_type(prop);
int is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(ptr, prop));
int is_boolean = (type == PROP_BOOLEAN && !RNA_property_array_check(prop));
name= RNA_property_ui_name(prop);