[Bf-blender-cvs] [9aae62a59b2] master: Particles: remove unused sel_col and nosel_col from CacheEditrPathsIterData and PTCacheEdit

[Philipp Oeser]

Commit: 9aae62a59b2e8cfbf476a33e99ac1966b96e2bc9
Author: Philipp Oeser
Date:   Wed Feb 12 19:17:19 2020 +0100
Branches: master
https://developer.blender.org/rB9aae62a59b2e8cfbf476a33e99ac1966b96e2bc9

Particles: remove unused sel_col and nosel_col from
CacheEditrPathsIterData and PTCacheEdit

Followup to 80cecee5b7c8.

ref D6725

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

M	source/blender/blenkernel/BKE_pointcache.h
M	source/blender/blenkernel/intern/particle.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/physics/particle_object.c

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

diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index fd29480cac7..d906e1e3f65 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -274,9 +274,6 @@ typedef struct PTCacheEdit {
   ListBase pathcachebufs;
 
   int totpoint, totframes, totcached, edited;
-
-  unsigned char sel_col[3];
-  unsigned char nosel_col[3];
 } PTCacheEdit;
 
 /* Particle functions */
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index bda768626b4..68df93d742a 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3112,8 +3112,6 @@ typedef struct CacheEditrPathsIterData {
   ParticleData *pa;
   int segments;
   bool use_weight;
-  float sel_col[3];
-  float nosel_col[3];
 } CacheEditrPathsIterData;
 
 static void psys_cache_edit_paths_iter(void *__restrict iter_data_v,
@@ -3330,18 +3328,6 @@ void psys_cache_edit_paths(Depsgraph *depsgraph,
   iter_data.segments = segments;
   iter_data.use_weight = use_weight;
 
-  if (use_weight) {
-    /* use weight painting colors now... */
-  }
-  else {
-    iter_data.sel_col[0] = (float)edit->sel_col[0] / 255.0f;
-    iter_data.sel_col[1] = (float)edit->sel_col[1] / 255.0f;
-    iter_data.sel_col[2] = (float)edit->sel_col[2] / 255.0f;
-    iter_data.nosel_col[0] = (float)edit->nosel_col[0] / 255.0f;
-    iter_data.nosel_col[1] = (float)edit->nosel_col[1] / 255.0f;
-    iter_data.nosel_col[2] = (float)edit->nosel_col[2] / 255.0f;
-  }
-
   TaskParallelSettings settings;
   BLI_parallel_range_settings_defaults(&settings);
   settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC;
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 02842f87700..ca13133662f 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -5188,15 +5188,6 @@ void PE_create_particle_edit(
       psys = NULL;
     }
 
-    /* Causes assert on startup. */
-#if 0
-    /* 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));
-    memset(edit->nosel_col, 0x00, sizeof(edit->nosel_col));
-#endif
     recalc_lengths(edit);
     if (psys && !cache) {
       recalc_emitter_field(depsgraph, ob, psys);
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c
index c2407310e64..4bd58d1bebc 100644
--- a/source/blender/editors/physics/particle_object.c
+++ b/source/blender/editors/physics/particle_object.c
@@ -1037,10 +1037,6 @@ static void copy_particle_edit(Depsgraph *depsgraph,
   }
   update_world_cos(ob, edit);
 
-  /* 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);
   recalc_emitter_field(depsgraph, ob, psys);
   PE_update_object(depsgraph, scene, ob, true);