[Bf-blender-cvs] [841745a33bb] greasepencil-object: Use Onion colors for Textured strokes
Antonio Vazquez
noreply at git.blender.org
Sun Feb 25 19:25:12 CET 2018
Commit: 841745a33bbb3e1f6e83048c7d638f95f8326f6c
Author: Antonio Vazquez
Date: Sun Feb 25 19:24:59 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB841745a33bbb3e1f6e83048c7d638f95f8326f6c
Use Onion colors for Textured strokes
Before, if the stroke was textured, the onion frames were not using the assigned for prev and next frames in the onion skin panel.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.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 7f26d671745..224b68e3599 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -336,7 +336,7 @@ static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(GPENCIL_e_data *e_data,
/* create shading group for strokes */
DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENCIL_Data *vedata, DRWPass *pass, GPUShader *shader, Object *ob,
- bGPdata *gpd, PaletteColor *palcolor, int id)
+ bGPdata *gpd, PaletteColor *palcolor, int id, bool onion)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
const float *viewport_size = DRW_viewport_size_get();
@@ -367,7 +367,7 @@ DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
stl->shgroups[id].stroke_style = palcolor->stroke_style;
stl->shgroups[id].color_type = GPENCIL_COLOR_SOLID;
- if (palcolor->stroke_style == STROKE_STYLE_TEXTURE) {
+ if ((palcolor->stroke_style == STROKE_STYLE_TEXTURE) && (!onion)) {
stl->shgroups[id].color_type = GPENCIL_COLOR_TEXTURE;
if (palcolor->flag & PAC_COLOR_PATTERN) {
stl->shgroups[id].color_type = GPENCIL_COLOR_PATTERN;
@@ -400,7 +400,7 @@ DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
}
/* image texture for pattern */
- if ((palcolor) && (palcolor->stroke_style == STROKE_STYLE_TEXTURE)) {
+ if ((palcolor) && (palcolor->stroke_style == STROKE_STYLE_TEXTURE) && (!onion)) {
ImBuf *ibuf;
Image *image = palcolor->sima;
ImageUser iuser = { NULL };
@@ -431,7 +431,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,
- bGPdata *gpd, PaletteColor *palcolor, int id)
+ bGPdata *gpd, PaletteColor *palcolor, int id, bool onion)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
const float *viewport_size = DRW_viewport_size_get();
@@ -459,7 +459,7 @@ DRWShadingGroup *DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data, GPENCI
stl->shgroups[id].stroke_style = palcolor->stroke_style;
stl->shgroups[id].color_type = GPENCIL_COLOR_SOLID;
- if (palcolor->stroke_style == STROKE_STYLE_TEXTURE) {
+ if ((palcolor->stroke_style == STROKE_STYLE_TEXTURE) && (!onion)) {
stl->shgroups[id].color_type = GPENCIL_COLOR_TEXTURE;
if (palcolor->flag & PAC_COLOR_PATTERN) {
stl->shgroups[id].color_type = GPENCIL_COLOR_PATTERN;
@@ -492,7 +492,7 @@ DRWShadingGroup *DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data, GPENCI
}
/* image texture */
- if ((palcolor) && (palcolor->stroke_style == STROKE_STYLE_TEXTURE)) {
+ if ((palcolor) && (palcolor->stroke_style == STROKE_STYLE_TEXTURE) && (!onion)) {
ImBuf *ibuf;
Image *image = palcolor->sima;
ImageUser iuser = { NULL };
@@ -665,10 +665,10 @@ static void gpencil_draw_onion_strokes(GpencilBatchCache *cache, GPENCIL_e_data
stl->shgroups[id].shgrps_fill = NULL;
if ((gps->totpoints > 1) && (gps->palcolor->mode == PAC_MODE_LINE)) {
- stl->shgroups[id].shgrps_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->stroke_pass, e_data->gpencil_stroke_sh, ob, gpd, gps->palcolor, id);
+ stl->shgroups[id].shgrps_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->stroke_pass, e_data->gpencil_stroke_sh, ob, gpd, gps->palcolor, id, true);
}
else {
- 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(e_data, vedata, psl->stroke_pass, e_data->gpencil_point_sh, ob, gpd, gps->palcolor, id, true);
}
/* stroke */
@@ -791,10 +791,10 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache, GPENCIL_e_data *e_dat
stl->shgroups[id].shgrps_fill = NULL;
}
if (gps->palcolor->mode == PAC_MODE_LINE) {
- stl->shgroups[id].shgrps_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->stroke_pass, e_data->gpencil_stroke_sh, ob, gpd, gps->palcolor, id);
+ stl->shgroups[id].shgrps_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->stroke_pass, e_data->gpencil_stroke_sh, ob, gpd, gps->palcolor, id, false);
}
else {
- 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(e_data, vedata, psl->stroke_pass, e_data->gpencil_point_sh, ob, gpd, gps->palcolor, id, false);
}
}
else {
@@ -872,10 +872,10 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
/* if only one point, don't need to draw buffer because the user has no time to see it */
if (gpd->sbuffer_size > 1) {
if ((palcolor) && (palcolor->mode == PAC_MODE_LINE)) {
- stl->g_data->shgrps_drawing_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->drawing_pass, e_data->gpencil_stroke_sh, NULL, gpd, palcolor, -1);
+ stl->g_data->shgrps_drawing_stroke = DRW_gpencil_shgroup_stroke_create(e_data, vedata, psl->drawing_pass, e_data->gpencil_stroke_sh, NULL, gpd, palcolor, -1, false);
}
else {
- stl->g_data->shgrps_drawing_stroke = DRW_gpencil_shgroup_point_create(e_data, vedata, psl->drawing_pass, e_data->gpencil_point_sh, NULL, gpd, palcolor, -1);
+ stl->g_data->shgrps_drawing_stroke = DRW_gpencil_shgroup_point_create(e_data, vedata, psl->drawing_pass, e_data->gpencil_point_sh, NULL, gpd, palcolor, -1, false);
}
/* use unit matrix because the buffer is in screen space and does not need conversion */
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 9c097f1ef38..65887aa2a7e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -321,9 +321,9 @@ typedef struct GpencilBatchCache {
} 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 bGPdata *gpd, struct PaletteColor *palcolor, int id, bool onion);
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 bGPdata *gpd, struct PaletteColor *palcolor, int id);
+ struct bGPdata *gpd, struct PaletteColor *palcolor, 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_buffer_strokes(struct GPENCIL_e_data *e_data, void *vedata, struct ToolSettings *ts, struct Object *ob);
More information about the Bf-blender-cvs
mailing list