Commit: c922172ca9b0b04f18c1cccf85572941b4b1ce86
Author: Antonio Vazquez
Date: Mon Jul 3 20:27:55 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc922172ca9b0b04f18c1cccf85572941b4b1ce86
Cleanup: Remove unused variables
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index e0190ce8cfc..93f6d7b3c05 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -214,8 +214,7 @@ static GpencilBatchCache *gpencil_batch_cache_get(bGPdata
*gpd, int cfra)
/* create shading group for filling */
static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(GPENCIL_e_data
*e_data, GPENCIL_Data *vedata, DRWPass *pass,
- GPUShader *shader, Object *ob,
- bGPdata *gpd, PaletteColor *palcolor, int id)
+ GPUShader *shader, bGPdata *gpd, PaletteColor *palcolor, int id)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -358,7 +357,7 @@ DRWShadingGroup
*DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
}
/* create shading group for volumetrics */
-DRWShadingGroup *DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data,
GPENCIL_Data *vedata, DRWPass *pass, GPUShader *shader, Object *ob,
+DRWShadingGroup *DRW_gpencil_shgroup_point_create(GPENCIL_Data *vedata,
DRWPass *pass, GPUShader *shader, Object *ob,
bGPdata *gpd, PaletteColor *palcolor, int id)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -448,7 +447,7 @@ static void gpencil_add_fill_shgroup(GpencilBatchCache
*cache, DRWShadingGroup *
}
/* add stroke shading group to pass */
-static void gpencil_add_stroke_shgroup(GPENCIL_StorageList *stl,
GpencilBatchCache *cache, DRWShadingGroup *strokegrp,
+static void gpencil_add_stroke_shgroup(GpencilBatchCache *cache,
DRWShadingGroup *strokegrp,
bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf, bGPDstroke *gps,
const float opacity, const float tintcolor[4], const bool onion, const
bool custonion)
{
@@ -547,7 +546,7 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
GPENCIL_e_data *e_dat
int id = stl->storage->shgroup_id;
if ((gps->totpoints > 1) && (gps->palcolor->stroke_style !=
STROKE_STYLE_VOLUMETRIC)) {
if (gps->totpoints > 2) {
- stl->shgroups[id].shgrps_fill =
DRW_gpencil_shgroup_fill_create(e_data, vedata, psl->stroke_pass,
e_data->gpencil_fill_sh, ob, gpd, gps->palcolor, id);
+ stl->shgroups[id].shgrps_fill =
DRW_gpencil_shgroup_fill_create(e_data, vedata, psl->stroke_pass,
e_data->gpencil_fill_sh, gpd, gps->palcolor, id);
}
else {
stl->shgroups[id].shgrps_fill = NULL;
@@ -556,7 +555,7 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
GPENCIL_e_data *e_dat
}
else {
stl->shgroups[id].shgrps_fill = NULL;
- stl->shgroups[id].shgrps_stroke =
DRW_gpencil_shgroup_point_create(e_data, vedata, psl->stroke_pass,
e_data->gpencil_point_sh, ob, gpd, gps->palcolor, id);
+ stl->shgroups[id].shgrps_stroke =
DRW_gpencil_shgroup_point_create(vedata, psl->stroke_pass,
e_data->gpencil_point_sh, ob, gpd, gps->palcolor, id);
}
++stl->storage->shgroup_id;
@@ -567,7 +566,7 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
GPENCIL_e_data *e_dat
gpencil_add_fill_shgroup(cache, fillgrp, gpd, gpl, gpf,
gps, tintcolor, onion, custonion);
}
/* stroke */
- gpencil_add_stroke_shgroup(stl, cache, strokegrp, gpd, gpl,
gpf, gps, opacity, tintcolor, onion, custonion);
+ gpencil_add_stroke_shgroup(cache, strokegrp, gpd, gpl, gpf,
gps, opacity, tintcolor, onion, custonion);
/* edit points (only in edit mode) */
if (!onion) {
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c
b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 25607ee9160..70b9a72cf21 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -181,7 +181,7 @@ static void GPENCIL_cache_init(void *vedata)
stl->g_data->shgrps_drawing_stroke =
DRW_gpencil_shgroup_stroke_create(&e_data, vedata, psl->drawing_pass,
e_data.gpencil_stroke_sh, NULL, NULL, palcolor, -1);
}
else {
- stl->g_data->shgrps_drawing_stroke =
DRW_gpencil_shgroup_point_create(&e_data, vedata, psl->drawing_pass,
e_data.gpencil_point_sh, NULL, NULL, palcolor, -1);
+ stl->g_data->shgrps_drawing_stroke =
DRW_gpencil_shgroup_point_create(vedata, psl->drawing_pass,
e_data.gpencil_point_sh, NULL, NULL, palcolor, -1);
}
stl->g_data->shgrps_drawing_fill =
DRW_gpencil_shgroup_drawing_fill_create(psl->drawing_pass,
e_data.gpencil_drawing_fill_sh);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h
b/source/blender/draw/engines/gpencil/gpencil_engine.h
index b9088604af4..183f35d3eed 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -149,7 +149,7 @@ typedef struct GpencilBatchCache {
struct DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(struct
GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct DRWPass *pass,
struct GPUShader *shader, struct Object *ob,
struct bGPdata
*gpd, struct PaletteColor *palcolor, int id);
-struct DRWShadingGroup *DRW_gpencil_shgroup_point_create(struct GPENCIL_e_data
*e_data, struct GPENCIL_Data *vedata, struct DRWPass *pass, struct GPUShader
*shader, struct Object *ob,
+struct DRWShadingGroup *DRW_gpencil_shgroup_point_create(struct GPENCIL_Data
*vedata, struct DRWPass *pass, struct GPUShader *shader, struct Object *ob,
struct bGPdata
*gpd, struct PaletteColor *palcolor, int id);
struct DRWShadingGroup *DRW_gpencil_shgroup_point_volumetric_create(struct
DRWPass *pass, struct GPUShader *shader);
struct DRWShadingGroup *DRW_gpencil_shgroup_edit_volumetric_create(struct
DRWPass *pass, struct GPUShader *shader);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
