[Bf-blender-cvs] [082b32c53a7] greasepencil-object: Rename texture_shift to texture_offset
Antonio Vazquez
noreply at git.blender.org
Fri Oct 20 18:33:06 CEST 2017
Commit: 082b32c53a7fb221258414b24d91adebd04b646b
Author: Antonio Vazquez
Date: Fri Oct 20 18:32:40 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB082b32c53a7fb221258414b24d91adebd04b646b
Rename texture_shift to texture_offset
===================================================================
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M source/blender/blenkernel/intern/paint.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesrna/intern/rna_palette.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 7d48e3af07b..61ecfa59a35 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -251,7 +251,7 @@ class MATERIAL_PT_gpencil_palette_fillcolor(Panel):
col.template_ID(pcolor, "fill_image", open="image.open")
split = col.split(percentage=0.5)
subcol = split.column(align=True)
- subcol.prop(pcolor, "texture_shift", text="Location")
+ subcol.prop(pcolor, "texture_offset", text="Offset")
subcol.prop(pcolor, "texture_angle")
subcol.prop(pcolor, "texture_clamp", text="Clip Image")
subcol = split.column(align=True)
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 36aaa14d097..18beb22f241 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -555,7 +555,7 @@ PaletteColor *BKE_palette_color_copy(Palette *palette, PaletteColor *palcolor)
copy_v2_v2(newcolor->g_shift, palcolor->g_shift);
newcolor->t_angle = palcolor->t_angle;
copy_v2_v2(newcolor->t_scale, palcolor->t_scale);
- copy_v2_v2(newcolor->t_shift, palcolor->t_shift);
+ copy_v2_v2(newcolor->t_offset, palcolor->t_offset);
newcolor->t_opacity = palcolor->t_opacity;
newcolor->sima = palcolor->sima;
newcolor->ima = palcolor->ima;
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 8fcedfe5b6b..6ae82eb7112 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -278,7 +278,7 @@ static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(GPENCIL_e_data *e_data,
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_shift", palcolor->t_shift, 1);
+ DRW_shgroup_uniform_vec2(grp, "t_offset", palcolor->t_offset, 1);
DRW_shgroup_uniform_float(grp, "t_opacity", &palcolor->t_opacity, 1);
stl->shgroups[id].t_mix = palcolor->flag & PAC_COLOR_TEX_MIX ? 1 : 0;
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
index 1a988285c72..eb337b36117 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
@@ -10,7 +10,7 @@ uniform vec2 g_shift;
uniform float t_angle;
uniform vec2 t_scale;
-uniform vec2 t_shift;
+uniform vec2 t_offset;
uniform int t_mix;
uniform int t_flip;
uniform float t_opacity;
@@ -72,7 +72,7 @@ void main()
{
vec2 t_center = vec2(0.5, 0.5);
mat2 matrot_tex = mat2(cos(t_angle), -sin(t_angle), sin(t_angle), cos(t_angle));
- vec2 rot_tex = (matrot_tex * (texCoord_interp - t_center)) + t_center + t_shift;
+ vec2 rot_tex = (matrot_tex * (texCoord_interp - t_center)) + t_center + t_offset;
vec4 tmp_color;
tmp_color = (t_clamp == 0) ? texture2D(myTexture, rot_tex * t_scale) : texture2D(myTexture, clamp(rot_tex * t_scale, 0.0, 1.0));
vec4 text_color = vec4(tmp_color[0], tmp_color[1], tmp_color[2], tmp_color[3] * t_opacity);
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 29c177804fb..65e1cc69330 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -646,7 +646,7 @@ static void gp_draw_stroke_fill(
immUniform1f("t_angle", palcolor->t_angle);
immUniform2fv("t_scale", palcolor->t_scale);
- immUniform2fv("t_shift", palcolor->t_shift);
+ immUniform2fv("t_offset", palcolor->t_offset);
immUniform1f("t_opacity", palcolor->t_opacity);
immUniform1i("t_mix", palcolor->flag & PAC_COLOR_TEX_MIX ? 1 : 0);
immUniform1i("t_flip", palcolor->flag & PAC_COLOR_FLIP_FILL ? 1 : 0);
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
index f23a132c568..d95e15c06fc 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
@@ -11,7 +11,7 @@ uniform vec2 g_shift;
uniform float t_angle;
uniform vec2 t_scale;
-uniform vec2 t_shift;
+uniform vec2 t_offset;
uniform int t_mix;
uniform int t_flip;
uniform float t_opacity;
@@ -95,7 +95,7 @@ void main()
{
vec2 t_center = vec2(0.5, 0.5);
mat2 matrot_tex = mat2(cos(t_angle), -sin(t_angle), sin(t_angle), cos(t_angle));
- vec2 rot_tex = (matrot_tex * (texCoord_interp - t_center)) + t_center + t_shift;
+ vec2 rot_tex = (matrot_tex * (texCoord_interp - t_center)) + t_center + t_offset;
vec4 tmp_color = texture2D(myTexture, rot_tex * t_scale);
vec4 text_color = vec4(tmp_color[0], tmp_color[1], tmp_color[2], tmp_color[3] * t_opacity);
vec4 chesscolor;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 6981f0f76d4..070a2c2c1b7 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -164,7 +164,7 @@ typedef struct PaletteColor {
float g_shift[2]; /* factor to shift filling in 2d space */
float t_angle; /* angle used for texture orientation */
float t_scale[2]; /* texture scale (separated of uv scale) */
- float t_shift[2]; /* factor to shift texture in 2d space */
+ float t_offset[2]; /* factor to shift texture in 2d space */
float t_opacity; /* texture opacity */
char pad[4];
} PaletteColor;
diff --git a/source/blender/makesrna/intern/rna_palette.c b/source/blender/makesrna/intern/rna_palette.c
index 24cb783c777..78af9bc9c48 100644
--- a/source/blender/makesrna/intern/rna_palette.c
+++ b/source/blender/makesrna/intern/rna_palette.c
@@ -350,10 +350,10 @@ static void rna_def_palettecolor(BlenderRNA *brna)
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_GPencil_update");
/* Shift factor to move texture in 2d space */
- prop = RNA_def_property(srna, "texture_shift", PROP_FLOAT, PROP_COORDS);
- RNA_def_property_float_sdna(prop, NULL, "t_shift");
+ prop = RNA_def_property(srna, "texture_offset", PROP_FLOAT, PROP_COORDS);
+ RNA_def_property_float_sdna(prop, NULL, "t_offset");
RNA_def_property_array(prop, 2);
- RNA_def_property_ui_text(prop, "Shift", "Shift Texture in 2d Space");
+ RNA_def_property_ui_text(prop, "Offset", "Shift Texture in 2d Space");
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_GPencil_update");
/* Texture opacity size */
More information about the Bf-blender-cvs
mailing list