diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/key.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 8 | ||||
| -rw-r--r-- | source/blender/physics/BPH_mass_spring.h | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 3aea343ec5a..4f4c5bf8643 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1002,7 +1002,9 @@ static void do_key(const int start, int end, const int tot, char *poin, Key *key k1 += elemsize; } } - else k1 += elemsize; + else { + k1 += elemsize; + } } if (flagdo & 2) { if (flagflo & 2) { diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index d164f3c674b..adf0fdfa609 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1667,7 +1667,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem) int w = UI_UNIT_X * 5; int h = UI_UNIT_Y * 5; - if(args.show_labels) { + if (args.show_labels) { h += (int)(1.25f * UI_UNIT_Y); } @@ -1676,13 +1676,15 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem) icon = item[a].icon; value = item[a].value; - if(args.show_labels) { - but = uiDefIconTextButR_prop(block, UI_BTYPE_ROW, 0, icon, item[a].name, x, y, w, h, - &args.ptr, args.prop, -1, 0, value, -1, -1, NULL); + if (args.show_labels) { + but = uiDefIconTextButR_prop( + block, UI_BTYPE_ROW, 0, icon, item[a].name, x, y, w, h, + &args.ptr, args.prop, -1, 0, value, -1, -1, NULL); } else { - but = uiDefIconButR_prop(block, UI_BTYPE_ROW, 0, icon, x, y, w, h, - &args.ptr, args.prop, -1, 0, value, -1, -1, NULL); + but = uiDefIconButR_prop( + block, UI_BTYPE_ROW, 0, icon, x, y, w, h, + &args.ptr, args.prop, -1, 0, value, -1, -1, NULL); } ui_def_but_icon(but, icon, UI_HAS_ICON | UI_BUT_ICON_PREVIEW); } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index ac34184c208..a569bf469b3 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4669,7 +4669,9 @@ static void *do_projectpaint_thread(void *ph_v) rgb_straight[3] = projPixel->origColor.f_pt[3]; straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight); } - else projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3]; + else { + projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3]; + } } last_partial_redraw_cell = last_projIma->partRedrawRect + projPixel->bb_cell_index; @@ -4844,7 +4846,9 @@ static void *do_projectpaint_thread(void *ph_v) rgb_straight[3] = projPixel->origColor.f_pt[3]; straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight); } - else projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3]; + else { + projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3]; + } } } diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h index 1a10b9398a2..de5fdd2b81d 100644 --- a/source/blender/physics/BPH_mass_spring.h +++ b/source/blender/physics/BPH_mass_spring.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/physics/intern/BPH_mass_spring.h +/** \file blender/physics/BPH_mass_spring.h * \ingroup bph */ |