[Bf-blender-cvs] [f18d8d84d1a] greasepencil-object: Cleanup: Style
Antonio Vazquez
noreply at git.blender.org
Wed Apr 4 17:42:03 CEST 2018
Commit: f18d8d84d1ac2d728071eff34f45597d8c355c76
Author: Antonio Vazquez
Date: Wed Apr 4 17:41:50 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf18d8d84d1ac2d728071eff34f45597d8c355c76
Cleanup: Style
===================================================================
M source/blender/draw/engines/gpencil/gpencil_geom.c
M source/blender/draw/engines/gpencil/gpencil_vfx.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_geom.c b/source/blender/draw/engines/gpencil/gpencil_geom.c
index 2cdae9dddd2..e86c3e66530 100644
--- a/source/blender/draw/engines/gpencil/gpencil_geom.c
+++ b/source/blender/draw/engines/gpencil/gpencil_geom.c
@@ -115,7 +115,7 @@ Gwn_Batch *DRW_gpencil_get_point_geom(bGPDstroke *gps, short thickness, const fl
GWN_vertbuf_attr_set(vbo, uvdata_id, idx, uvdata);
GWN_vertbuf_attr_set(vbo, pos_id, idx, &pt->x);
- ++idx;
+ idx++;
}
return GWN_batch_create_ex(GWN_PRIM_POINTS, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -150,29 +150,29 @@ Gwn_Batch *DRW_gpencil_get_stroke_geom(bGPDframe *gpf, bGPDstroke *gps, short th
if (gps->flag & GP_STROKE_CYCLIC && totpoints > 2) {
gpencil_set_stroke_point(vbo, gpf->viewmatrix, &points[totpoints - 1], idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, ink);
- ++idx;
+ idx++;
}
else {
gpencil_set_stroke_point(vbo, gpf->viewmatrix, &points[1], idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, ink);
- ++idx;
+ idx++;
}
}
/* set point */
gpencil_set_stroke_point(vbo, gpf->viewmatrix, pt, idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, ink);
- ++idx;
+ idx++;
}
if (gps->flag & GP_STROKE_CYCLIC && totpoints > 2) {
/* draw line to first point to complete the cycle */
gpencil_set_stroke_point(vbo, gpf->viewmatrix, &points[0], idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, ink);
- ++idx;
+ idx++;
/* now add adjacency point (not drawn) */
gpencil_set_stroke_point(vbo, gpf->viewmatrix, &points[1], idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, ink);
- ++idx;
+ idx++;
}
/* last adjacency point (not drawn) */
else {
@@ -299,7 +299,7 @@ Gwn_Batch *DRW_gpencil_get_buffer_point_geom(bGPdata *gpd, float matrix[4][4], s
/* set point */
gpencil_set_stroke_point(vbo, matrix, &pt, idx,
pos_id, color_id, thickness_id, uvdata_id, thickness, gpd->scolor);
- ++idx;
+ idx++;
}
return GWN_batch_create_ex(GWN_PRIM_POINTS, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -625,7 +625,7 @@ Gwn_Batch *DRW_gpencil_get_fill_geom(bGPDstroke *gps, const float color[4])
gpencil_set_fill_point(
vbo, idx, &gps->points[stroke_triangle->verts[j]], color, stroke_triangle->uv[j],
pos_id, color_id, text_id);
- ++idx;
+ idx++;
}
}
@@ -722,7 +722,7 @@ Gwn_Batch *DRW_gpencil_get_edit_geom(bGPDstroke *gps, float alpha, short dflag)
GWN_vertbuf_attr_set(vbo, color_id, idx, fcolor);
GWN_vertbuf_attr_set(vbo, size_id, idx, &fsize);
GWN_vertbuf_attr_set(vbo, pos_id, idx, &pt->x);
- ++idx;
+ idx++;
}
return GWN_batch_create_ex(GWN_PRIM_POINTS, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -782,7 +782,7 @@ Gwn_Batch *DRW_gpencil_get_edlin_geom(bGPDstroke *gps, float alpha, short UNUSED
GWN_vertbuf_attr_set(vbo, color_id, idx, fcolor);
GWN_vertbuf_attr_set(vbo, pos_id, idx, &pt->x);
- ++idx;
+ idx++;
}
return GWN_batch_create_ex(GWN_PRIM_LINE_STRIP, vbo, NULL, GWN_BATCH_OWNS_VBO);
diff --git a/source/blender/draw/engines/gpencil/gpencil_vfx.c b/source/blender/draw/engines/gpencil/gpencil_vfx.c
index 637582eb041..b1389aa114e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_vfx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_vfx.c
@@ -125,7 +125,7 @@ static void DRW_gpencil_vfx_wave(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
DRWShadingGroup *vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_wave_sh, psl->vfx_wave_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
@@ -209,7 +209,7 @@ static void DRW_gpencil_vfx_blur(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_blur_sh, psl->vfx_blur_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
@@ -241,7 +241,7 @@ static void DRW_gpencil_vfx_pixel(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_pixel_sh, psl->vfx_pixel_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
@@ -283,7 +283,7 @@ static void DRW_gpencil_vfx_swirl(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_swirl_sh, psl->vfx_swirl_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
@@ -333,7 +333,7 @@ static void DRW_gpencil_vfx_flip(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_flip_sh, psl->vfx_flip_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
@@ -395,7 +395,7 @@ static void DRW_gpencil_vfx_light(
struct Gwn_Batch *vfxquad = DRW_cache_fullscreen_quad_get();
vfx_shgrp = DRW_shgroup_create(e_data->gpencil_vfx_light_sh, psl->vfx_light_pass);
- ++stl->g_data->tot_sh;
+ stl->g_data->tot_sh++;
DRW_shgroup_call_add(vfx_shgrp, vfxquad, NULL);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeColor", &e_data->vfx_color_tx_a);
DRW_shgroup_uniform_texture_ref(vfx_shgrp, "strokeDepth", &e_data->vfx_depth_tx_a);
More information about the Bf-blender-cvs
mailing list