[Bf-blender-cvs] [14ec05f5618] greasepencil-object: Cleanup: Fix old comments
Antonio Vazquez
noreply at git.blender.org
Sun Apr 29 11:36:52 CEST 2018
Commit: 14ec05f56184ac515c30db55c72bb232d2dab5a3
Author: Antonio Vazquez
Date: Sun Apr 29 11:36:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB14ec05f56184ac515c30db55c72bb232d2dab5a3
Cleanup: Fix old comments
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_geom.c
===================================================================
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 4d59ab7547b..bd802610718 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -320,7 +320,7 @@ static void gpencil_add_fill_shgroup(GpencilBatchCache *cache, DRWShadingGroup *
GpencilColorData *gpcolor = BKE_material_gpencil_settings_get(ob, gps->mat_nr + 1);
if (gps->totpoints >= 3) {
float tfill[4];
- /* set color using palette, tint color and opacity */
+ /* set color using material, tint color and opacity */
interp_v3_v3v3(tfill, gps->tmp_fill, tintcolor, tintcolor[3]);
tfill[3] = gps->tmp_fill[3] * gpl->opacity;
if ((tfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gpcolor->fill_style > 0)) {
@@ -634,7 +634,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
float obscale = (ob->size[0] + ob->size[1] + ob->size[2]) / 3.0f;
- /* if the brush has a palette and color defined, use these and not current defaults */
+ /* if the brush has a default material defined, use these and not current defaults */
Material *mat = BKE_gpencil_get_color_from_brush(brush);
if (mat != NULL) {
gpcolor = mat->gpcolor;
diff --git a/source/blender/draw/engines/gpencil/gpencil_geom.c b/source/blender/draw/engines/gpencil/gpencil_geom.c
index fcf8319c0ed..9ea7660b957 100644
--- a/source/blender/draw/engines/gpencil/gpencil_geom.c
+++ b/source/blender/draw/engines/gpencil/gpencil_geom.c
@@ -663,7 +663,6 @@ Gwn_Batch *DRW_gpencil_get_edit_geom(bGPDstroke *gps, float alpha, short dflag)
}
/* for now, we assume that the base color of the points is not too close to the real color */
- /* set color using palette */
float selectColor[4];
UI_GetThemeColor3fv(TH_GP_VERTEX_SELECT, selectColor);
selectColor[3] = alpha;
More information about the Bf-blender-cvs
mailing list