Merging r46111 through r46136 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / interface_templates.c
index c6bc975..bb48569 100644 (file)
@@ -2364,7 +2364,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
 
                if (ptr->data && prop) {
                        /* create list items */
-                       RNA_PROP_BEGIN (ptr, itemptr, prop) {
+                       RNA_PROP_BEGIN (ptr, itemptr, prop)
+                       {
                                /* create button */
                                if (!(i % 9))
                                        row = uiLayoutRow(col, 0);
@@ -2386,7 +2387,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
 
                if (ptr->data && prop) {
                        /* create list items */
-                       RNA_PROP_BEGIN (ptr, itemptr, prop) {
+                       RNA_PROP_BEGIN (ptr, itemptr, prop)
+                       {
                                found = (activei == i);
 
                                if (found) {
@@ -2448,7 +2450,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
 
                if (ptr->data && prop) {
                        /* create list items */
-                       RNA_PROP_BEGIN (ptr, itemptr, prop) {
+                       RNA_PROP_BEGIN (ptr, itemptr, prop)
+                       {
                                if (i >= pa->list_scroll && i < pa->list_scroll + items)
                                        list_item_row(C, col, ptr, &itemptr, i, rnaicon, activeptr, activeprop, prop_list);
 
@@ -2705,7 +2708,8 @@ static void template_keymap_item_properties(uiLayout *layout, const char *title,
        
        flow = uiLayoutColumnFlow(layout, 2, 0);
 
-       RNA_STRUCT_BEGIN (ptr, prop) {
+       RNA_STRUCT_BEGIN (ptr, prop)
+       {
                int flag = RNA_property_flag(prop);
 
                if (flag & PROP_HIDDEN)