[Bf-blender-cvs] [dfa87d37290] greasepencil-object: Cleanup: Remove duplicate parameter (cont.)

Antonio Vazquez noreply at git.blender.org
Tue May 15 09:31:43 CEST 2018


Commit: dfa87d3729009332cb414b9996f62a155eaa6393
Author: Antonio Vazquez
Date:   Tue May 15 09:31:32 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdfa87d3729009332cb414b9996f62a155eaa6393

Cleanup: Remove duplicate parameter (cont.)

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.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_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 12ccfb8b13c..6bd52df5306 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1124,10 +1124,11 @@ void DRW_gpencil_populate_multiedit(GPENCIL_e_data *e_data, void *vedata, Scene
 }
 
 /* helper for populate a complete grease pencil datablock */
-void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene *scene, Object *ob, ToolSettings *ts, bGPdata *gpd)
+void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene *scene, Object *ob, bGPdata *gpd)
 {
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 	const DRWContextState *draw_ctx = DRW_context_state_get();
+	ToolSettings *ts = scene->toolsettings;
 	bGPDframe *derived_gpf = NULL;
 	bool no_onion = (bool)(gpd->flag & GP_DATA_STROKE_WEIGHTMODE);
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index b2a3a937f84..b7870694070 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -434,7 +434,6 @@ void GPENCIL_cache_finish(void *vedata)
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	Scene *scene = draw_ctx->scene;
-	ToolSettings *ts = scene->toolsettings;
 	bool is_multiedit = false; 
 
 	/* if painting session, don't need to do more */
@@ -454,7 +453,7 @@ void GPENCIL_cache_finish(void *vedata)
 			/* fill shading groups */
 			is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
 			if (!is_multiedit) {
-				DRW_gpencil_populate_datablock(&e_data, vedata, scene, ob, ts, gpd);
+				DRW_gpencil_populate_datablock(&e_data, vedata, scene, ob, gpd);
 			}
 			else {
 				DRW_gpencil_populate_multiedit(&e_data, vedata, scene, ob, gpd);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index fb3f4e25988..1485a38d29a 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -235,7 +235,7 @@ typedef struct GpencilBatchCache {
 /* general drawing functions */
 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 MaterialGPencilStyle *gp_style, int id, bool onion);
-void DRW_gpencil_populate_datablock(struct GPENCIL_e_data *e_data, void *vedata, struct Scene *scene, struct Object *ob, struct ToolSettings *ts, struct bGPdata *gpd);
+void DRW_gpencil_populate_datablock(struct GPENCIL_e_data *e_data, void *vedata, struct Scene *scene, struct Object *ob, struct bGPdata *gpd);
 void DRW_gpencil_populate_buffer_strokes(struct GPENCIL_e_data *e_data, void *vedata, struct ToolSettings *ts, struct Object *ob);
 void DRW_gpencil_populate_multiedit(struct GPENCIL_e_data *e_data, void *vedata, struct Scene *scene, struct Object *ob, struct bGPdata *gpd);
 void DRW_gpencil_triangulate_stroke_fill(struct bGPDstroke *gps);



More information about the Bf-blender-cvs mailing list