griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Style Cleanup: minor edits in recent changes

Browse Source
This commit is contained in:
Campbell Barton
2013-12-18 15:35:31 +11:00
parent 509f169011
commit d9e42cf43e
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenfont/intern/blf_font.c
View File

@@ -431,8 +431,7 @@ size_t blf_font_width_to_strlen(FontBLF *font, const char *str, size_t len, floa
blf_font_ensure_ascii_table(font);
while ((i_prev = i), (width_new = pen_x), ((i < len) && str[i]))
{
while ((i_prev = i), (width_new = pen_x), ((i < len) && str[i])) {
BLF_UTF8_NEXT_FAST(font, g, str, i, c, glyph_ascii_table);
if (c == BLI_UTF8_ERR)

2
source/blender/blenkernel/intern/image.c
View File

@@ -146,7 +146,7 @@ static void imagecache_put(Image *image, int index, ImBuf *ibuf)
IMB_moviecache_put(image->cache, &key, ibuf);
}
static struct ImBuf* imagecache_get(Image *image, int index)
static struct ImBuf *imagecache_get(Image *image, int index)
{
if (image->cache) {
ImageCacheKey key;

4
source/blender/blenkernel/intern/modifier.c
View File

@@ -271,8 +271,8 @@ bool modifier_supportsCage(struct Scene *scene, ModifierData *md)
md->scene = scene;
return ((!mti->isDisabled || !mti->isDisabled(md, 0)) &&
(mti->flags & eModifierTypeFlag_SupportsEditmode) &&
modifier_supportsMapping(md));
(mti->flags & eModifierTypeFlag_SupportsEditmode) &&
modifier_supportsMapping(md));
}
bool modifier_couldBeCage(struct Scene *scene, ModifierData *md)

4
source/blender/editors/interface/interface_templates.c
View File

@@ -1518,7 +1518,7 @@ static void colorband_buttons_layout(uiLayout *layout, uiBlock *block, ColorBand
row = uiLayoutRow(split, FALSE);
uiDefButS(block, NUM, 0, "", 0, 0, 5.0f * UI_UNIT_X, UI_UNIT_Y, &coba->cur, 0.0, (float)(MAX2(0, coba->tot - 1)),
0, 0, TIP_("Choose active color stop"));
0, 0, TIP_("Choose active color stop"));
row = uiLayoutRow(split, FALSE);
uiItemR(row, &ptr, "position", 0, IFACE_("Pos"), ICON_NONE);
bt = block->buttons.last;
@@ -1533,7 +1533,7 @@ static void colorband_buttons_layout(uiLayout *layout, uiBlock *block, ColorBand
row = uiLayoutRow(subsplit, FALSE);
uiDefButS(block, NUM, 0, "", 0, 0, 5.0f * UI_UNIT_X, UI_UNIT_Y, &coba->cur, 0.0, (float)(MAX2(0, coba->tot - 1)),
0, 0, TIP_("Choose active color stop"));
0, 0, TIP_("Choose active color stop"));
row = uiLayoutRow(subsplit, FALSE);
uiItemR(row, &ptr, "position", 0, IFACE_("Pos"), ICON_NONE);
bt = block->buttons.last;

10
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -3014,8 +3014,8 @@ static void do_gravity(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode, fl
mul_v3_fl(offset, bstrength);
/* threaded loop over nodes */
#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
for(n = 0; n < totnode; n++) {
#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
for (n = 0; n < totnode; n++) {
PBVHVertexIter vd;
SculptBrushTest test;
float (*proxy)[3];
@@ -3027,12 +3027,12 @@ static void do_gravity(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode, fl
BKE_pbvh_vertex_iter_begin(ss->pbvh, nodes[n], vd, PBVH_ITER_UNIQUE) {
if (sculpt_brush_test_sq(&test, vd.co)) {
const float fade = tex_strength(ss, brush, vd.co, sqrt(test.dist),
ss->cache->sculpt_normal_symm, vd.no,
vd.fno, vd.mask ? *vd.mask : 0.0f);
ss->cache->sculpt_normal_symm, vd.no,
vd.fno, vd.mask ? *vd.mask : 0.0f);
mul_v3_v3fl(proxy[vd.i], offset, fade);
if(vd.mvert)
if (vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
}
}