blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

GPencil: Fix unreported vertex size for Bezier handles 

By error, the Bezier points were using the mesh vertex size, not the grease pencil vertex size.
This commit is contained in:
Antonio Vazquez 2020-11-27 20:09:53 +01:00
parent fbdf1af355
commit f8553de2cd
Notes: blender-bot 2023-02-14 07:25:51 +01:00 
Referenced by issue #83149, Cycles: Adaptive Sampling + OptiX Denoise causes tile-sized artefacts
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
View File

@ -18,21 +18,22 @@ void main()
GPU_INTEL_VERTEX_SHADER_WORKAROUND
/* Reuse the FREESTYLE flag to determine is GPencil. */
bool is_gpencil = ((data & EDGE_FREESTYLE) != 0);
if ((data & VERT_SELECTED) != 0) {
if ((data & VERT_ACTIVE) != 0) {
finalColor = colorEditMeshActive;
}
else {
finalColor = ((data & EDGE_FREESTYLE) == 0) ? colorVertexSelect : colorGpencilVertexSelect;
finalColor = (!is_gpencil) ? colorVertexSelect : colorGpencilVertexSelect;
}
}
else {
finalColor = ((data & EDGE_FREESTYLE) == 0) ? colorVertex : colorGpencilVertex;
finalColor = (!is_gpencil) ? colorVertex : colorGpencilVertex;
}
vec3 world_pos = point_object_to_world(pos);
gl_Position = point_world_to_ndc(world_pos);
gl_PointSize = sizeVertex * 2.0;
gl_PointSize = (!is_gpencil) ? sizeVertex * 2.0 : sizeVertexGpencil * 2.0;
#ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos);
#endif