[Bf-blender-cvs] [a78341fe16e] greasepencil-object: Cleanup: Remove unused and change comments

Antonio Vazquez noreply at git.blender.org
Sun May 6 15:12:27 CEST 2018


Commit: a78341fe16edbb592595c9244d7ed143904d95c0
Author: Antonio Vazquez
Date:   Sun May 6 15:12:17 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa78341fe16edbb592595c9244d7ed143904d95c0

Cleanup: Remove unused and change comments

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

M	source/blender/editors/gpencil/gpencil_colorpick.c

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

diff --git a/source/blender/editors/gpencil/gpencil_colorpick.c b/source/blender/editors/gpencil/gpencil_colorpick.c
index 71b2eab739b..3e2793caac1 100644
--- a/source/blender/editors/gpencil/gpencil_colorpick.c
+++ b/source/blender/editors/gpencil/gpencil_colorpick.c
@@ -88,10 +88,9 @@ typedef struct tGPDpickColor {
 	struct Material *mat; /* material */
 	rcti full_rect;  /* full size of region occupied by color box (for event/highlight handling) */
 	rcti rect;       /* box position */
-	int index;       /* index of color in material slots */
-	float rgba[4];   /* color */
+	int index;       /* index of color */
+	float rgba[4];   /* stroke color */
 	float fill[4];   /* fill color */
-	bool fillmode;   /* flag fill is not enabled */
 } tGPDpickColor;
 
 /* Temporary color picker operation data (op->customdata) */
@@ -408,7 +407,6 @@ static tGPDpick *gpencil_colorpick_init(bContext *C, wmOperator *op, const wmEve
 		tcolor->mat = mat;
 		copy_v4_v4(tcolor->rgba, gpcolor->rgb);
 		copy_v4_v4(tcolor->fill, gpcolor->fill);
-		tcolor->fillmode = (gpcolor->fill[3] > 0.0f);
 
 		/* box position */
 		tcolor->rect.xmin = tgpk->panel.xmin + (tgpk->boxsize[0] * col) + (GP_BOX_GAP * (col + 1)) - (GP_BOX_GAP / 2);



More information about the Bf-blender-cvs mailing list