Cleanup: style

This commit is contained in:
Campbell Barton 2018-10-05 15:01:58 +10:00
parent 402bde39d1
commit f36f029321
8 changed files with 13 additions and 14 deletions

View File

@ -21,4 +21,3 @@ def register():
def unregister():
import bpy
bpy.app.handlers.load_post.remove(load_handler)

View File

@ -65,18 +65,18 @@ void main()
vec2 rotpoint = vec2((tpos.x * cosv) - (tpos.y * sinv), (tpos.x * sinv) + (tpos.y * cosv));
tpos = rotpoint;
}
/* apply offset */
tpos = vec2(tpos.x - dx, tpos.y - dy);
/* apply scale */
tpos.x *= 1.0 / scale[0];
tpos.y *= 1.0 / scale[1];
/* back to original coords system */
vec2 texpos = tpos + loc2d;
/* wave */
/* wave */
if (orientation == HORIZONTAL) {
float pval = (uv.x * M_PI) / Viewport[0];
texpos.y += amplitude * sin((period * pval) + phase);
@ -85,7 +85,7 @@ void main()
float pval = (uv.y * M_PI) / Viewport[1];
texpos.x += amplitude * sin((period * pval) + phase);
}
vec4 src_pixel = texelFetch(strokeColor, ivec2(texpos.x, texpos.y), 0);
/* is transparent */
if (src_pixel.a == 0.0f) {

View File

@ -26,7 +26,7 @@ void main()
outcolor = shadow_pixel;
outdepth = shadow_depth;
}
gl_FragDepth = outdepth;
FragColor = outcolor;
}

View File

@ -1024,7 +1024,7 @@ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_S
param.curveOutX = ebone->curveOutX;
param.curveOutY = ebone->curveOutY;
ebone->segments = BKE_compute_b_bone_spline(&param, (Mat4*)result_array);
ebone->segments = BKE_compute_b_bone_spline(&param, (Mat4 *)result_array);
}
static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pchan)

View File

@ -833,7 +833,7 @@ static bool gp_stroke_do_circle_sel(
int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
int i;
bool changed = false;
if (gps->totpoints == 1) {
bGPDspoint pt_temp;
gp_point_to_parent_space(gps->points, diff_mat, &pt_temp);
@ -1044,7 +1044,7 @@ static int gpencil_box_select_exec(bContext *C, wmOperator *op)
/* init space conversion stuff */
gp_point_conversion_init(C, &gsc);
/* deselect all strokes first? */
if (select && !extend) {
CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)

View File

@ -453,7 +453,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
}
}
}
BMFace *face; /* Mesh face. */
BMIter iter; /* Selected faces iterator. */

View File

@ -14,4 +14,4 @@ void main()
{
gl_Position = ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
finalColor = ((flag & FACE_SELECT) != 0) ? selectColor : vertColor;
}
}

View File

@ -39,4 +39,4 @@ void main()
// convert to PointCoord units
radii /= pointSize;
}
}