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>2018-12-20 00:01:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-20 00:03:48 +0300
commit65bc9313067426b12580ce53aa6d77d42c7d200f (patch)
tree686cd3b450bae25fc5ee55c36680a1343d5b0d7d /source/blender/draw/engines/gpencil
parent1ce9a142b6abda92e20886d54b79c9de74099f5a (diff)
Cleanup: argument wrapping indentation
Diffstat (limited to 'source/blender/draw/engines/gpencil')
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c38
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_engine.c51
2 files changed, 45 insertions, 44 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 32bf80d4757..a6ef5d6a45a 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -97,8 +97,8 @@ static void gpencil_calc_vertex(
/* verify time modifiers */
if ((time_remap) && (!stl->storage->simplify_modif)) {
int remap_cfra = BKE_gpencil_time_modifier(
- draw_ctx->depsgraph, draw_ctx->scene, ob, gpl, cfra_eval,
- stl->storage->is_render);
+ draw_ctx->depsgraph, draw_ctx->scene, ob, gpl, cfra_eval,
+ stl->storage->is_render);
init_gpf = BKE_gpencil_layer_getframe(gpl, remap_cfra, GP_GETFRAME_USE_PREV);
}
else {
@@ -1238,9 +1238,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
if (gp_style->flag & GP_STYLE_STROKE_SHOW) {
DRW_shgroup_call_add(
- stl->g_data->shgrps_drawing_stroke,
- e_data->batch_buffer_stroke,
- stl->storage->unit_matrix);
+ stl->g_data->shgrps_drawing_stroke,
+ e_data->batch_buffer_stroke,
+ stl->storage->unit_matrix);
}
if ((gpd->runtime.sbuffer_size >= 3) &&
@@ -1265,9 +1265,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
e_data->batch_buffer_fill = DRW_gpencil_get_buffer_fill_geom(gpd);
DRW_shgroup_call_add(
- stl->g_data->shgrps_drawing_fill,
- e_data->batch_buffer_fill,
- stl->storage->unit_matrix);
+ stl->g_data->shgrps_drawing_fill,
+ e_data->batch_buffer_fill,
+ stl->storage->unit_matrix);
stl->storage->buffer_fill = true;
}
stl->storage->buffer_stroke = true;
@@ -1297,9 +1297,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
e_data->batch_buffer_ctrlpoint = DRW_gpencil_get_buffer_ctrlpoint_geom(gpd);
DRW_shgroup_call_add(
- shgrp,
- e_data->batch_buffer_ctrlpoint,
- stl->storage->unit_matrix);
+ shgrp,
+ e_data->batch_buffer_ctrlpoint,
+ stl->storage->unit_matrix);
stl->storage->buffer_ctrlpoint = true;
}
@@ -1438,10 +1438,10 @@ static void DRW_gpencil_shgroups_create(
const int len = elm->vertex_idx - start_edit;
/* use always the same group */
DRW_shgroup_call_range_add(
- stl->g_data->shgrps_edit_point,
- cache->b_edit.batch,
- (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
- start_edit, len);
+ stl->g_data->shgrps_edit_point,
+ cache->b_edit.batch,
+ (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
+ start_edit, len);
start_edit = elm->vertex_idx;
}
@@ -1453,10 +1453,10 @@ static void DRW_gpencil_shgroups_create(
const int len = elm->vertex_idx - start_edlin;
/* use always the same group */
DRW_shgroup_call_range_add(
- stl->g_data->shgrps_edit_line,
- cache->b_edlin.batch,
- (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
- start_edlin, len);
+ stl->g_data->shgrps_edit_line,
+ cache->b_edlin.batch,
+ (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix : cache_ob->obmat,
+ start_edlin, len);
start_edlin = elm->vertex_idx;
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index dc62ca34c92..23c53977445 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -125,10 +125,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
if (stl->storage->framebuffer_flag & GP_FRAMEBUFFER_BASIC) {
/* temp textures for ping-pong buffers */
e_data.temp_depth_tx_a = DRW_texture_pool_query_2D(
- size[0], size[1], GPU_DEPTH_COMPONENT24,
- &draw_engine_gpencil_type);
- e_data.temp_color_tx_a = DRW_texture_pool_query_2D(size[0], size[1], fb_format,
- &draw_engine_gpencil_type);
+ size[0], size[1], GPU_DEPTH_COMPONENT24,
+ &draw_engine_gpencil_type);
+ e_data.temp_color_tx_a = DRW_texture_pool_query_2D(
+ size[0], size[1], fb_format,
+ &draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_a, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_a),
@@ -136,11 +137,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
});
e_data.temp_depth_tx_b = DRW_texture_pool_query_2D(
- size[0], size[1], GPU_DEPTH_COMPONENT24,
- &draw_engine_gpencil_type);
+ size[0], size[1], GPU_DEPTH_COMPONENT24,
+ &draw_engine_gpencil_type);
e_data.temp_color_tx_b = DRW_texture_pool_query_2D(
- size[0], size[1], fb_format,
- &draw_engine_gpencil_type);
+ size[0], size[1], fb_format,
+ &draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_b, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_b),
@@ -149,11 +150,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* used for FX effects and Layer blending */
e_data.temp_depth_tx_fx = DRW_texture_pool_query_2D(
- size[0], size[1], GPU_DEPTH_COMPONENT24,
- &draw_engine_gpencil_type);
+ size[0], size[1], GPU_DEPTH_COMPONENT24,
+ &draw_engine_gpencil_type);
e_data.temp_color_tx_fx = DRW_texture_pool_query_2D(
- size[0], size[1], fb_format,
- &draw_engine_gpencil_type);
+ size[0], size[1], fb_format,
+ &draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->temp_fb_fx, {
GPU_ATTACHMENT_TEXTURE(e_data.temp_depth_tx_fx),
@@ -164,11 +165,11 @@ static void GPENCIL_create_framebuffers(void *vedata)
/* background framebuffer to speed up drawing process (always 16 bits) */
if (stl->storage->framebuffer_flag & GP_FRAMEBUFFER_DRAW) {
e_data.background_depth_tx = DRW_texture_pool_query_2D(
- size[0], size[1], GPU_DEPTH_COMPONENT24,
- &draw_engine_gpencil_type);
+ size[0], size[1], GPU_DEPTH_COMPONENT24,
+ &draw_engine_gpencil_type);
e_data.background_color_tx = DRW_texture_pool_query_2D(
- size[0], size[1], GPU_RGBA32F,
- &draw_engine_gpencil_type);
+ size[0], size[1], GPU_RGBA32F,
+ &draw_engine_gpencil_type);
GPU_framebuffer_ensure_config(
&fbl->background_fb, {
GPU_ATTACHMENT_TEXTURE(e_data.background_depth_tx),
@@ -624,9 +625,9 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
}
DRW_shgroup_call_add(
- stl->g_data->shgrps_grid,
- e_data.batch_grid,
- stl->storage->grid_matrix);
+ stl->g_data->shgrps_grid,
+ e_data.batch_grid,
+ stl->storage->grid_matrix);
}
}
}
@@ -829,9 +830,9 @@ void GPENCIL_draw_scene(void *ved)
GPU_framebuffer_bind(fbl->temp_fb_fx);
GPU_framebuffer_clear_color_depth(fbl->temp_fb_fx, clearcol, 1.0f);
gpencil_draw_pass_range(
- fbl, stl, psl, txl, fbl->temp_fb_fx,
- init_shgrp, end_shgrp,
- is_last);
+ fbl, stl, psl, txl, fbl->temp_fb_fx,
+ init_shgrp, end_shgrp,
+ is_last);
/* Blend A texture and FX texture */
GPU_framebuffer_bind(fbl->temp_fb_b);
@@ -858,9 +859,9 @@ void GPENCIL_draw_scene(void *ved)
}
/* last group */
gpencil_draw_pass_range(
- fbl, stl, psl, txl, fbl->temp_fb_a,
- init_shgrp, end_shgrp,
- true);
+ fbl, stl, psl, txl, fbl->temp_fb_a,
+ init_shgrp, end_shgrp,
+ true);
}
/* Current buffer drawing */