Merging r58125 through r58143 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / interface / interface_templates.c
index 8caa059d168cbea45459857da5385f2c0bd8f748..275fa6a38f94b4ceaa0a5be0c30c2e9ddd56f6c0 100644 (file)
@@ -2648,7 +2648,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                                                sub = uiLayoutRow(overlap, FALSE);
 
                                                but = uiDefButR_prop(subblock, LISTROW, 0, "", 0, 0, UI_UNIT_X * 10, UI_UNIT_Y,
-                                                                    active_dataptr, activeprop, 0, 0, i, 0, 0, "");
+                                                                    active_dataptr, activeprop, 0, 0, i, 0, 0, NULL);
                                                uiButSetFlag(but, UI_BUT_NO_TOOLTIP);
 
                                                sub = uiLayoutRow(overlap, FALSE);
@@ -2662,6 +2662,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                                                if (i == activei) {
                                                        ui_layout_list_set_labels_active(sub);
                                                }
+
+                                               uiBlockClearFlag(subblock, UI_BLOCK_LIST_ITEM);
                                        }
                                        i++;
                                }
@@ -2736,7 +2738,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                                        sub = uiLayoutRow(overlap, FALSE);
 
                                        but = uiDefButR_prop(subblock, LISTROW, 0, "", 0, 0, UI_UNIT_X * 10, UI_UNIT_Y,
-                                                            active_dataptr, activeprop, 0, 0, i, 0, 0, "");
+                                                            active_dataptr, activeprop, 0, 0, i, 0, 0, NULL);
                                        uiButSetFlag(but, UI_BUT_NO_TOOLTIP);
 
                                        sub = uiLayoutRow(overlap, FALSE);
@@ -2749,6 +2751,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
                                                ui_layout_list_set_labels_active(sub);
                                        }
 
+                                       uiBlockClearFlag(subblock, UI_BLOCK_LIST_ITEM);
+
                                        i++;
                                }
                                RNA_PROP_END;