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-04-18 18:17:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-18 18:19:44 +0300
commit4439e5d0ba3ffde3841ec44405a9bcaf800be279 (patch)
treed0955d8e18d854603da54bed39c46ef9627c4736 /source/blender/draw/intern/draw_cache.c
parent098f75897e3ddf4bb93f64cecb322d7370127419 (diff)
Cleanup: add trailing commas to avoid right shift
Diffstat (limited to 'source/blender/draw/intern/draw_cache.c')
-rw-r--r--source/blender/draw/intern/draw_cache.c54
1 files changed, 31 insertions, 23 deletions
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 7099f6ca573..6b6a79bfb60 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -482,8 +482,9 @@ GPUBatch *DRW_cache_empty_cube_get(void)
{1.0f, 1.0f, 1.0f},
};
- const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5,
- 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6};
+ const GLubyte indices[24] = {
+ 0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6,
+ };
/* Position Only 3D format */
static GPUVertFormat format = {0};
@@ -659,17 +660,20 @@ GPUBatch *DRW_cache_gpencil_axes_get(void)
float v2[3] = {0.0f, 0.0f, 0.0f};
/* cube data */
- const GLfloat verts[8][3] = {{-0.25f, -0.25f, -0.25f},
- {-0.25f, -0.25f, 0.25f},
- {-0.25f, 0.25f, -0.25f},
- {-0.25f, 0.25f, 0.25f},
- {0.25f, -0.25f, -0.25f},
- {0.25f, -0.25f, 0.25f},
- {0.25f, 0.25f, -0.25f},
- {0.25f, 0.25f, 0.25f}};
-
- const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5,
- 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6};
+ const GLfloat verts[8][3] = {
+ {-0.25f, -0.25f, -0.25f},
+ {-0.25f, -0.25f, 0.25f},
+ {-0.25f, 0.25f, -0.25f},
+ {-0.25f, 0.25f, 0.25f},
+ {0.25f, -0.25f, -0.25f},
+ {0.25f, -0.25f, 0.25f},
+ {0.25f, 0.25f, -0.25f},
+ {0.25f, 0.25f, 0.25f},
+ };
+
+ const GLubyte indices[24] = {
+ 0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6,
+ };
/* Position Only 3D format */
static GPUVertFormat format = {0};
@@ -1746,11 +1750,13 @@ GPUBatch *DRW_cache_light_spot_volume_get(void)
GPUBatch *DRW_cache_light_spot_square_get(void)
{
if (!SHC.drw_light_spot_square) {
- float p[5][3] = {{0.0f, 0.0f, 0.0f},
- {1.0f, 1.0f, -1.0f},
- {1.0f, -1.0f, -1.0f},
- {-1.0f, -1.0f, -1.0f},
- {-1.0f, 1.0f, -1.0f}};
+ float p[5][3] = {
+ {0.0f, 0.0f, 0.0f},
+ {1.0f, 1.0f, -1.0f},
+ {1.0f, -1.0f, -1.0f},
+ {-1.0f, -1.0f, -1.0f},
+ {-1.0f, 1.0f, -1.0f},
+ };
uint v_idx = 0;
@@ -1783,11 +1789,13 @@ GPUBatch *DRW_cache_light_spot_square_get(void)
GPUBatch *DRW_cache_light_spot_square_volume_get(void)
{
if (!SHC.drw_light_spot_square_volume) {
- float p[5][3] = {{0.0f, 0.0f, 0.0f},
- {1.0f, 1.0f, -1.0f},
- {1.0f, -1.0f, -1.0f},
- {-1.0f, -1.0f, -1.0f},
- {-1.0f, 1.0f, -1.0f}};
+ float p[5][3] = {
+ {0.0f, 0.0f, 0.0f},
+ {1.0f, 1.0f, -1.0f},
+ {1.0f, -1.0f, -1.0f},
+ {-1.0f, -1.0f, -1.0f},
+ {-1.0f, 1.0f, -1.0f},
+ };
uint v_idx = 0;