[Bf-blender-cvs] [99c595499fb] greasepencil-object: Cleanup: More unused variables

Antonio Vazquez noreply at git.blender.org
Tue Jun 13 16:52:06 CEST 2017


Commit: 99c595499fb9e05cb9c85e4e76a9641b8bffbd5c
Author: Antonio Vazquez
Date:   Tue Jun 13 16:46:50 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB99c595499fb9e05cb9c85e4e76a9641b8bffbd5c

Cleanup: More unused variables

Remove gpd from gp_copybuf_validate_colormap

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

M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_intern.h

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

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 18d853c4ef1..a63f414b895 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -864,7 +864,7 @@ static void gp_brush_clone_init(bContext *C, tGP_BrushEditData *gso)
 	/* Init colormap for mapping between the pasted stroke's source colour(names)
 	 * and the final colours that will be used here instead...
 	 */
-	data->new_colors = gp_copybuf_validate_colormap(C, gso->gpd);
+	data->new_colors = gp_copybuf_validate_colormap(C);
 }
 
 /* Free custom data used for "clone" brush */
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index b3c182c8a41..4f2913688ef 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -609,7 +609,7 @@ void ED_gpencil_strokes_copybuf_free(void)
 /* Ensure that destination datablock has all the colours the pasted strokes need
  * Helper function for copy-pasting strokes
  */
-GHash *gp_copybuf_validate_colormap(bContext *C, bGPdata *gpd)
+GHash *gp_copybuf_validate_colormap(bContext *C)
 {
 	GHash *new_colors = BLI_ghash_str_new("GPencil Paste Dst Colors");
 	GHashIterator gh_iter;
@@ -830,7 +830,7 @@ static int gp_strokes_paste_exec(bContext *C, wmOperator *op)
 	CTX_DATA_END;
 	
 	/* Ensure that all the necessary colors exist */
-	new_colors = gp_copybuf_validate_colormap(C, gpd);
+	new_colors = gp_copybuf_validate_colormap(C);
 		
 	/* Copy over the strokes from the buffer (and adjust the colors) */
 	for (bGPDstroke *gps = gp_strokes_copypastebuf.first; gps; gps = gps->next) {
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index b8490544d75..e826eececc1 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -156,7 +156,7 @@ int gp_brush_crt_presets_poll(bContext *C);
 extern ListBase gp_strokes_copypastebuf;
 
 /* Build a map for converting between old colornames and destination-color-refs */
-struct GHash *gp_copybuf_validate_colormap(struct bContext *C, struct bGPdata *gpd);
+struct GHash *gp_copybuf_validate_colormap(struct bContext *C);
 
 /* Stroke Editing ------------------------------------ */




More information about the Bf-blender-cvs mailing list