Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-01-31 15:02:20 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-02-12 21:03:28 +0300
commit80cecee5b7c81feb1e2a5e56cbfed66981124265 (patch)
tree500f6eba0722527d14fd1385fbf2b8b9b7c14429 /source/blender/draw
parent5527cd4ba0b1d5e5721708b0859b6483070f3b44 (diff)
Fix T68788: Particle Edit Mode Hair vertex doesn't follow vertex theme
color Selection and grooming only ever happens on hair keys (vertices), so makes sense to use that theme color. Sidenote: `CacheEditrPathsIterData` and `PTCacheEdit` have `sel_col` and `nosel_col`, these can go, will do in a separate commit. Maniphest Tasks: T68788 Differential Revision: https://developer.blender.org/D6725
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl2
-rw-r--r--source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl
index 86d5547225c..efc0d7bee61 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl
@@ -9,7 +9,7 @@ void main()
vec3 world_pos = point_object_to_world(pos);
gl_Position = point_world_to_ndc(world_pos);
- finalColor = mix(colorWire, colorEdgeSelect, color);
+ finalColor = mix(colorWire, colorVertexSelect, color);
gl_PointSize = sizeVertex * 2.0;
diff --git a/source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl
index 1dde94f751c..adda4866bf1 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl
@@ -33,7 +33,7 @@ void main()
finalColor = vec4(weight_to_rgb(color), 1.0);
}
else {
- finalColor = mix(colorWire, colorEdgeSelect, color);
+ finalColor = mix(colorWire, colorVertexSelect, color);
}
#ifdef USE_WORLD_CLIP_PLANES