archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-10-21 16:22:46 +11:00
parent 769b979abb
commit 1f67db75f1
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
View File

@@ -134,7 +134,8 @@ tGPencilObjectCache *gpencil_object_cache_add(
cache_elem->idx = *gp_cache_used; cache_elem->idx = *gp_cache_used;
/* check if object is duplicated */ /* check if object is duplicated */
cache_elem->is_dup_ob = gpencil_check_ob_duplicated(cache_array, cache_elem->is_dup_ob = gpencil_check_ob_duplicated(
cache_array,
*gp_cache_used, ob_orig, *gp_cache_used, ob_orig,
&cache_elem->data_idx); &cache_elem->data_idx);

4
source/blender/editors/space_action/action_draw.c
View File

@@ -302,7 +302,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
/* frames one and higher get a saturated background */ /* frames one and higher get a saturated background */
immUniformColor3ubvAlpha(color, MIN2(255, color[3]*2)); immUniformColor3ubvAlpha(color, MIN2(255, color[3] * 2));
immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac));
} }
else if (ac->datatype == ANIMCONT_MASK) { else if (ac->datatype == ANIMCONT_MASK) {
@@ -313,7 +313,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
/* frames one and higher get a saturated background */ /* frames one and higher get a saturated background */
immUniformColor3ubvAlpha(color, MIN2(255, color[3]*2)); immUniformColor3ubvAlpha(color, MIN2(255, color[3] * 2));
immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac));
} }
} }

2
source/blender/editors/uvedit/uvedit_parametrizer.c
View File

@@ -4189,7 +4189,7 @@ static void p_add_ngon(ParamHandle *handle, ParamKey key, int nverts,
float normal[3]; float normal[3];
zero_v3(normal); zero_v3(normal);
const float *co_curr, *co_prev = co[nverts-1]; const float *co_curr, *co_prev = co[nverts - 1];
for (int j = 0; j < nverts; j++) { for (int j = 0; j < nverts; j++) {
co_curr = co[j]; co_curr = co[j];
add_newell_cross_v3_v3v3(normal, co_prev, co_curr); add_newell_cross_v3_v3v3(normal, co_prev, co_curr);