diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
commit | cd972535027a73ba70069051fe9038b6a8b5696a (patch) | |
tree | b50696bddbc710192b89e34fcdd1e82e6c8073b7 /source/blender/editors/interface/interface_templates.c | |
parent | aca76ddb502cbf0ee7888c3356f9f35240919410 (diff) |
- added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 75daa7633a4..ae75bd03d86 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -55,7 +55,7 @@ #include "BLF_api.h" -void ui_template_fix_linking() +void ui_template_fix_linking(void) { } @@ -1959,7 +1959,6 @@ static int list_item_icon_get(bContext *C, PointerRNA *itemptr, int rnaicon) static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *itemptr, int i, int rnaicon, PointerRNA *activeptr, const char *activepropname) { - Object *ob; uiBlock *block= uiLayoutGetBlock(layout); uiBut *but; uiLayout *split, *overlap, *sub, *row; @@ -2024,7 +2023,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe } } else if(itemptr->type == &RNA_ShapeKey) { - ob= (Object*)activeptr->data; + Object *ob= (Object*)activeptr->data; split= uiLayoutSplit(sub, 0.75f, 0); @@ -2324,9 +2323,9 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C) } if(WM_jobs_test(wm, owner)) { - uiLayout *abs; + uiLayout *ui_abs; - abs = uiLayoutAbsolute(layout, 0); + ui_abs= uiLayoutAbsolute(layout, 0); uiDefIconBut(block, BUT, handle_event, ICON_PANEL_CLOSE, 0, UI_UNIT_Y*0.1, UI_UNIT_X*0.8, UI_UNIT_Y*0.8, NULL, 0.0f, 0.0f, 0, 0, "Stop this job"); @@ -2349,7 +2348,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C) Report *report= BKE_reports_last_displayable(reports); ReportTimerInfo *rti; - uiLayout *abs; + uiLayout *ui_abs; uiBlock *block; uiBut *but; uiStyle *style= U.uistyles.first; @@ -2363,8 +2362,8 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C) if (!rti || rti->widthfac==0.0 || !report) return; - abs = uiLayoutAbsolute(layout, 0); - block= uiLayoutGetBlock(abs); + ui_abs= uiLayoutAbsolute(layout, 0); + block= uiLayoutGetBlock(ui_abs); width = BLF_width(style->widget.uifont_id, report->message); width = MIN2(rti->widthfac*width, width); @@ -2373,7 +2372,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C) /* make a box around the report to make it stand out */ uiBlockBeginAlign(block); but= uiDefBut(block, ROUNDBOX, 0, "", 0, 0, UI_UNIT_X+10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, ""); - /* set the report's bg colour in but->col - ROUNDBOX feature */ + /* set the report's bg color in but->col - ROUNDBOX feature */ but->col[0]= FTOCHAR(rti->col[0]); but->col[1]= FTOCHAR(rti->col[1]); but->col[2]= FTOCHAR(rti->col[2]); |