diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-26 13:59:43 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-26 13:59:43 +0400 |
commit | 4a0351cba2cdc69222a0a2c4bd5905f448abee2b (patch) | |
tree | 7be6e1a8ae6f2c4df33423c91007a7895bf13ce5 /source/blender/editors/interface/interface_templates.c | |
parent | 18d2dd7e3ae0338829fd61740151f41c21668474 (diff) |
Freestyle changes:
- Revert some stylistic changes made in branch
They weren't directly related on freestyle project
and better be handled in trunk. Helps reading patches
ad prevents possible merge conflicts.
- Solved issue introduced with recent deprecation of
RenderData.maximize,
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 30d360363c6..4b70b6bd63b 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2469,7 +2469,7 @@ static void uilist_draw_item_default(struct uiList *ui_list, struct bContext *UN uiItemL(layout, name, icon); break; } - + /* free name */ if (namebuf) { MEM_freeN(namebuf); @@ -2559,7 +2559,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co if (ui_list_type == NULL) { RNA_warning("List type %s not found", listtype_name); return; - } + } draw_item = ui_list_type->draw_item ? ui_list_type->draw_item : uilist_draw_item_default; @@ -2574,7 +2574,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co ui_list = MEM_callocN(sizeof(uiList), __func__); BLI_strncpy(ui_list->list_id, ui_list_id, sizeof(ui_list->list_id)); BLI_addtail(&ar->ui_lists, ui_list); - } + } /* Because we can't actually pass type across save&load... */ ui_list->type = ui_list_type; @@ -2669,10 +2669,10 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co if (icon == ICON_DOT) icon = ICON_NONE; draw_item(ui_list, C, row, dataptr, &itemptr, icon, active_dataptr, active_propname, i); - } + } i++; -} + } RNA_PROP_END; } |