Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-04 14:09:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-04 14:13:58 +0300
commita53dccb2a9cabd0141cb7efb7959acfd4ea24dad (patch)
treeccdafe6cb7486a603645713878087ae493b0c51e /source/blender/draw/engines/gpencil/gpencil_engine.c
parent270fd28496f7277d0685d0ee03fea23ab39e3aaa (diff)
Cleanup: indentation, style
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_engine.c')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_engine.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 74b3e7a6f4f..60e6de164e7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -771,7 +771,7 @@ static void drw_gpencil_select_render(GPENCIL_StorageList *stl, GPENCIL_PassList
/* Draw all pending objects */
if ((stl->g_data->gp_cache_used > 0) &&
- (stl->g_data->gp_object_cache))
+ (stl->g_data->gp_object_cache))
{
/* sort by zdepth */
qsort(stl->g_data->gp_object_cache, stl->g_data->gp_cache_used,
@@ -977,18 +977,20 @@ void GPENCIL_draw_scene(void *ved)
stl->storage->tonemapping = stl->storage->is_render ? 1 : 0;
/* active select flag and selection color */
- stl->storage->do_select_outline = ((overlay) &&
- (ob->base_flag & BASE_SELECTED) &&
- (ob->mode == OB_MODE_OBJECT) &&
- (!is_render) && (!playing) &&
- (v3d->flag & V3D_SELECT_OUTLINE));
+ stl->storage->do_select_outline = (
+ (overlay) &&
+ (ob->base_flag & BASE_SELECTED) &&
+ (ob->mode == OB_MODE_OBJECT) &&
+ (!is_render) && (!playing) &&
+ (v3d->flag & V3D_SELECT_OUTLINE));
/* if active object is not object mode, disable for all objects */
if ((draw_ctx->obact) && (draw_ctx->obact->mode != OB_MODE_OBJECT)) {
stl->storage->do_select_outline = 0;
}
- UI_GetThemeColorShadeAlpha4fv((ob == draw_ctx->obact) ? TH_ACTIVE : TH_SELECT, 0, -40,
- stl->storage->select_color);
+ UI_GetThemeColorShadeAlpha4fv(
+ (ob == draw_ctx->obact) ? TH_ACTIVE : TH_SELECT, 0, -40,
+ stl->storage->select_color);
/* draw mix pass */
DRW_draw_pass(psl->mix_pass);