griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: correct spelling for alignment

Browse Source
This commit is contained in:
Campbell Barton
2024-03-09 16:43:34 +11:00
parent 74d9fb60ba
commit b1c59a793c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/draw/intern/shaders/common_gpencil_lib.glsl
View File

@@ -247,18 +247,18 @@ vec4 gpencil_vertex(vec4 viewport_size,
out_hardness = gpencil_decode_hardness(use_curr ? hardness1 : hardness2);
if (is_dot) {
uint alignement_mode = material_flags & GP_STROKE_ALIGNMENT;
uint alignment_mode = material_flags & GP_STROKE_ALIGNMENT;
/* For one point strokes use object alignment. */
if (alignement_mode == GP_STROKE_ALIGNMENT_STROKE && ma.x == -1 && ma2.x == -1) {
alignement_mode = GP_STROKE_ALIGNMENT_OBJECT;
if (alignment_mode == GP_STROKE_ALIGNMENT_STROKE && ma.x == -1 && ma2.x == -1) {
alignment_mode = GP_STROKE_ALIGNMENT_OBJECT;
}
vec2 x_axis;
if (alignement_mode == GP_STROKE_ALIGNMENT_STROKE) {
if (alignment_mode == GP_STROKE_ALIGNMENT_STROKE) {
x_axis = (ma2.x == -1) ? line_adj : line;
}
else if (alignement_mode == GP_STROKE_ALIGNMENT_FIXED) {
else if (alignment_mode == GP_STROKE_ALIGNMENT_FIXED) {
/* Default for no-material drawing. */
x_axis = vec2(1.0, 0.0);
}

10
source/blender/draw/intern/shaders/common_grease_pencil_lib.glsl
View File

@@ -244,18 +244,18 @@ vec4 gpencil_vertex(vec4 viewport_size,
out_hardness = gpencil_decode_hardness(use_curr ? hardness1 : hardness2);
if (is_dot) {
uint alignement_mode = material_flags & GP_STROKE_ALIGNMENT;
uint alignment_mode = material_flags & GP_STROKE_ALIGNMENT;
/* For one point strokes use object alignment. */
if (alignement_mode == GP_STROKE_ALIGNMENT_STROKE && ma.x == -1 && ma2.x == -1) {
alignement_mode = GP_STROKE_ALIGNMENT_OBJECT;
if (alignment_mode == GP_STROKE_ALIGNMENT_STROKE && ma.x == -1 && ma2.x == -1) {
alignment_mode = GP_STROKE_ALIGNMENT_OBJECT;
}
vec2 x_axis;
if (alignement_mode == GP_STROKE_ALIGNMENT_STROKE) {
if (alignment_mode == GP_STROKE_ALIGNMENT_STROKE) {
x_axis = (ma2.x == -1) ? line_adj : line;
}
else if (alignement_mode == GP_STROKE_ALIGNMENT_FIXED) {
else if (alignment_mode == GP_STROKE_ALIGNMENT_FIXED) {
/* Default for no-material drawing. */
x_axis = vec2(1.0, 0.0);
}

2
source/blender/gpu/shaders/opengl/glsl_shader_defines.glsl
View File

@@ -21,7 +21,7 @@
#define uint2 uvec2
#define uint3 uvec3
#define uint4 uvec4
/* GLSL already follows the packed alignement / size rules for vec3. */
/* GLSL already follows the packed alignment / size rules for vec3. */
#define packed_float3 float3
#define packed_int3 int3
#define packed_uint3 uint3