[Bf-blender-cvs] [80cecee5b7c] master: Fix T68788: Particle Edit Mode Hair vertex doesn't follow vertex theme color

[Philipp Oeser]

Commit: 80cecee5b7c81feb1e2a5e56cbfed66981124265
Author: Philipp Oeser
Date:   Fri Jan 31 13:02:20 2020 +0100
Branches: master
https://developer.blender.org/rB80cecee5b7c81feb1e2a5e56cbfed66981124265

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

===================================================================

M	source/blender/draw/engines/overlay/shaders/edit_particle_point_vert.glsl
M	source/blender/draw/engines/overlay/shaders/edit_particle_strand_vert.glsl
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/physics/particle_object.c

===================================================================

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
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 120c4929ecf..02842f87700 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -5190,7 +5190,8 @@ void PE_create_particle_edit(
 
     /* Causes assert on startup. */
 #if 0
-    UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
+    /* These are unused and can be removed. */
+    UI_GetThemeColor3ubv(TH_VERTEX_SELECT, edit->sel_col);
     UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
 #else
     memset(edit->sel_col, 0xff, sizeof(edit->sel_col));
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index 466b87755fe..c2407310e64 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -1037,7 +1037,8 @@ static void copy_particle_edit(Depsgraph *depsgraph,
   }
   update_world_cos(ob, edit);
 
-  UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
+  /* These are unused and can be removed. */
+  UI_GetThemeColor3ubv(TH_VERTEX_SELECT, edit->sel_col);
   UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
 
   recalc_lengths(edit);