Commit: 1e126fb8a41e117caaee1eb61a32842bd6c38a57
Author: Antonio Vazquez
Date: Tue Apr 24 19:31:06 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1e126fb8a41e117caaee1eb61a32842bd6c38a57
WIP: Replace field name for palettecolor
===================================================================
M source/blender/blenkernel/intern/material.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_geom.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index 27b5d02ad86..52d853f7b58 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -527,7 +527,7 @@ GpencilColorData *give_material_gpencil_settings(Object
*ob, short act)
{
Material *ma = give_current_material(ob, act);
if (ma != NULL) {
- return &ma->gpcolor;
+ return ma->gpcolor;
}
else {
return NULL;
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 f72ee41dd0f..ed092f4974e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -56,7 +56,7 @@
/* create shading group for filling */
static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(GPENCIL_e_data
*e_data, GPENCIL_Data *vedata, DRWPass *pass,
- GPUShader *shader, bGPdata *gpd, GpencilColorData *palcolor, int id)
+ GPUShader *shader, bGPdata *gpd, GpencilColorData *gpcolor, int id)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -65,33 +65,33 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_fill_create(GPENCIL_e_data *e_data,
stl->g_data->tot_sh++;
stl->g_data->tot_sh_fill++;
- DRW_shgroup_uniform_vec4(grp, "color2", palcolor->scolor, 1);
- stl->shgroups[id].fill_style = palcolor->fill_style;
+ DRW_shgroup_uniform_vec4(grp, "color2", gpcolor->scolor, 1);
+ stl->shgroups[id].fill_style = gpcolor->fill_style;
DRW_shgroup_uniform_int(grp, "fill_type",
&stl->shgroups[id].fill_style, 1);
- DRW_shgroup_uniform_float(grp, "mix_factor", &palcolor->mix_factor, 1);
+ DRW_shgroup_uniform_float(grp, "mix_factor", &gpcolor->mix_factor, 1);
- DRW_shgroup_uniform_float(grp, "g_angle", &palcolor->g_angle, 1);
- DRW_shgroup_uniform_float(grp, "g_radius", &palcolor->g_radius, 1);
- DRW_shgroup_uniform_float(grp, "g_boxsize", &palcolor->g_boxsize, 1);
- DRW_shgroup_uniform_vec2(grp, "g_scale", palcolor->g_scale, 1);
- DRW_shgroup_uniform_vec2(grp, "g_shift", palcolor->g_shift, 1);
+ DRW_shgroup_uniform_float(grp, "g_angle", &gpcolor->g_angle, 1);
+ DRW_shgroup_uniform_float(grp, "g_radius", &gpcolor->g_radius, 1);
+ DRW_shgroup_uniform_float(grp, "g_boxsize", &gpcolor->g_boxsize, 1);
+ DRW_shgroup_uniform_vec2(grp, "g_scale", gpcolor->g_scale, 1);
+ DRW_shgroup_uniform_vec2(grp, "g_shift", gpcolor->g_shift, 1);
- DRW_shgroup_uniform_float(grp, "t_angle", &palcolor->t_angle, 1);
- DRW_shgroup_uniform_vec2(grp, "t_scale", palcolor->t_scale, 1);
- DRW_shgroup_uniform_vec2(grp, "t_offset", palcolor->t_offset, 1);
- DRW_shgroup_uniform_float(grp, "t_opacity", &palcolor->t_opacity, 1);
+ DRW_shgroup_uniform_float(grp, "t_angle", &gpcolor->t_angle, 1);
+ DRW_shgroup_uniform_vec2(grp, "t_scale", gpcolor->t_scale, 1);
+ DRW_shgroup_uniform_vec2(grp, "t_offset", gpcolor->t_offset, 1);
+ DRW_shgroup_uniform_float(grp, "t_opacity", &gpcolor->t_opacity, 1);
- stl->shgroups[id].t_mix = palcolor->flag & GPC_COLOR_TEX_MIX ? 1 : 0;
+ stl->shgroups[id].t_mix = gpcolor->flag & GPC_COLOR_TEX_MIX ? 1 : 0;
DRW_shgroup_uniform_int(grp, "t_mix", &stl->shgroups[id].t_mix, 1);
- stl->shgroups[id].t_flip = palcolor->flag & GPC_COLOR_FLIP_FILL ? 1 : 0;
+ stl->shgroups[id].t_flip = gpcolor->flag & GPC_COLOR_FLIP_FILL ? 1 : 0;
DRW_shgroup_uniform_int(grp, "t_flip", &stl->shgroups[id].t_flip, 1);
DRW_shgroup_uniform_int(grp, "xraymode", (const int *) &gpd->xray_mode,
1);
/* image texture */
- if ((palcolor->fill_style == GPC_FILL_STYLE_TEXTURE) ||
(palcolor->fill_style == GPC_FILL_STYLE_PATTERN) || (palcolor->flag &
GPC_COLOR_TEX_MIX)) {
+ if ((gpcolor->fill_style == GPC_FILL_STYLE_TEXTURE) ||
(gpcolor->fill_style == GPC_FILL_STYLE_PATTERN) || (gpcolor->flag &
GPC_COLOR_TEX_MIX)) {
ImBuf *ibuf;
- Image *image = palcolor->ima;
+ Image *image = gpcolor->ima;
ImageUser iuser = { NULL };
void *lock;
@@ -103,10 +103,10 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_fill_create(GPENCIL_e_data *e_data,
BKE_image_release_ibuf(image, ibuf, NULL);
}
else {
- GPUTexture *texture =
GPU_texture_from_blender(palcolor->ima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
+ GPUTexture *texture =
GPU_texture_from_blender(gpcolor->ima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
DRW_shgroup_uniform_texture(grp, "myTexture", texture);
- stl->shgroups[id].t_clamp = palcolor->flag &
GPC_COLOR_TEX_CLAMP ? 1 : 0;
+ stl->shgroups[id].t_clamp = gpcolor->flag &
GPC_COLOR_TEX_CLAMP ? 1 : 0;
DRW_shgroup_uniform_int(grp, "t_clamp",
&stl->shgroups[id].t_clamp, 1);
BKE_image_release_ibuf(image, ibuf, NULL);
@@ -124,7 +124,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, GpencilColorData *palcolor, int id, bool onion)
+ bGPdata *gpd, GpencilColorData *gpcolor, int id, bool onion)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
const float *viewport_size = DRW_viewport_size_get();
@@ -153,11 +153,11 @@ DRWShadingGroup
*DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
stl->shgroups[id].keep_size = (int)((gpd) && (gpd->flag &
GP_DATA_STROKE_KEEPTHICKNESS));
DRW_shgroup_uniform_int(grp, "keep_size",
&stl->shgroups[id].keep_size, 1);
- stl->shgroups[id].stroke_style = palcolor->stroke_style;
+ stl->shgroups[id].stroke_style = gpcolor->stroke_style;
stl->shgroups[id].color_type = GPENCIL_COLOR_SOLID;
- if ((palcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
+ if ((gpcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
stl->shgroups[id].color_type = GPENCIL_COLOR_TEXTURE;
- if (palcolor->flag & GPC_COLOR_PATTERN) {
+ if (gpcolor->flag & GPC_COLOR_PATTERN) {
stl->shgroups[id].color_type =
GPENCIL_COLOR_PATTERN;
}
}
@@ -188,9 +188,9 @@ DRWShadingGroup
*DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
}
/* image texture for pattern */
- if ((palcolor) && (palcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE)
&& (!onion)) {
+ if ((gpcolor) && (gpcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
ImBuf *ibuf;
- Image *image = palcolor->sima;
+ Image *image = gpcolor->sima;
ImageUser iuser = { NULL };
void *lock;
@@ -202,7 +202,7 @@ DRWShadingGroup
*DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
BKE_image_release_ibuf(image, ibuf, NULL);
}
else {
- GPUTexture *texture =
GPU_texture_from_blender(palcolor->sima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
+ GPUTexture *texture =
GPU_texture_from_blender(gpcolor->sima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
DRW_shgroup_uniform_texture(grp, "myTexture", texture);
BKE_image_release_ibuf(image, ibuf, NULL);
@@ -219,7 +219,7 @@ DRWShadingGroup
*DRW_gpencil_shgroup_stroke_create(GPENCIL_e_data *e_data, GPENC
/* create shading group for volumetrics */
static DRWShadingGroup *DRW_gpencil_shgroup_point_create(GPENCIL_e_data
*e_data, GPENCIL_Data *vedata, DRWPass *pass, GPUShader *shader, Object *ob,
- bGPdata *gpd, GpencilColorData *palcolor, int id, bool onion)
+ bGPdata *gpd, GpencilColorData *gpcolor, int id, bool onion)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
const float *viewport_size = DRW_viewport_size_get();
@@ -245,12 +245,12 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data,
stl->shgroups[id].keep_size = (int)((gpd) && (gpd->flag &
GP_DATA_STROKE_KEEPTHICKNESS));
DRW_shgroup_uniform_int(grp, "keep_size",
&stl->shgroups[id].keep_size, 1);
- stl->shgroups[id].mode = palcolor->mode;
- stl->shgroups[id].stroke_style = palcolor->stroke_style;
+ stl->shgroups[id].mode = gpcolor->mode;
+ stl->shgroups[id].stroke_style = gpcolor->stroke_style;
stl->shgroups[id].color_type = GPENCIL_COLOR_SOLID;
- if ((palcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
+ if ((gpcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
stl->shgroups[id].color_type = GPENCIL_COLOR_TEXTURE;
- if (palcolor->flag & GPC_COLOR_PATTERN) {
+ if (gpcolor->flag & GPC_COLOR_PATTERN) {
stl->shgroups[id].color_type =
GPENCIL_COLOR_PATTERN;
}
}
@@ -262,7 +262,7 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data,
stl->storage->obj_scale = 1.0f;
stl->storage->keep_size = 0;
stl->storage->pixfactor = GP_DEFAULT_PIX_FACTOR;
- stl->storage->mode = palcolor->mode;
+ stl->storage->mode = gpcolor->mode;
DRW_shgroup_uniform_float(grp, "objscale",
&stl->storage->obj_scale, 1);
DRW_shgroup_uniform_int(grp, "keep_size",
&stl->storage->keep_size, 1);
DRW_shgroup_uniform_int(grp, "color_type",
&stl->storage->color_type, 1);
@@ -284,9 +284,9 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data,
}
/* image texture */
- if ((palcolor) && (palcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE)
&& (!onion)) {
+ if ((gpcolor) && (gpcolor->stroke_style == GPC_STROKE_STYLE_TEXTURE) &&
(!onion)) {
ImBuf *ibuf;
- Image *image = palcolor->sima;
+ Image *image = gpcolor->sima;
ImageUser iuser = { NULL };
void *lock;
@@ -298,7 +298,7 @@ static DRWShadingGroup
*DRW_gpencil_shgroup_point_create(GPENCIL_e_data *e_data,
BKE_image_release_ibuf(image, ibuf, NULL);
}
else {
- GPUTexture *texture =
GPU_texture_from_blender(palcolor->sima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
+ GPUTexture *texture =
GPU_texture_from_blender(gpcolor->sima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
DRW_shgroup_uniform_texture(grp, "myTexture", texture);
BKE_image_release_ibuf(image, ibuf, NULL);
@@ -317,13 +317,13 @@ static void gpencil_add_fill_shgroup(GpencilBatchCache
*cache, DRWShadingGroup *
Object *ob, bGPDlayer *gpl, bGPDframe *gpf, bGPDstroke *gps,
const float tintcolor[4], const bool onion, const bool custonion)
{
- GpencilColorData *gps_palcolor = give_material_gpencil_settings(ob,
gps->mat_nr + 1);
+ GpencilColorData *gpcolor = give_materia
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
