archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Particles: remove unused sel_col and nosel_col from

Browse Source 
CacheEditrPathsIterData and PTCacheEdit

Followup to 80cecee5b7.

ref D6725
This commit is contained in:
Philipp Oeser
2020-02-12 19:17:19 +01:00
parent 80cecee5b7
commit 9aae62a59b
4 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_pointcache.h
View File

@@ -274,9 +274,6 @@ typedef struct PTCacheEdit {
ListBase pathcachebufs; ListBase pathcachebufs;
int totpoint, totframes, totcached, edited; int totpoint, totframes, totcached, edited;
unsigned char sel_col[3];
unsigned char nosel_col[3];
} PTCacheEdit; } PTCacheEdit;
/* Particle functions */ /* Particle functions */

14
source/blender/blenkernel/intern/particle.c
View File

@@ -3112,8 +3112,6 @@ typedef struct CacheEditrPathsIterData {
ParticleData *pa; ParticleData *pa;
int segments; int segments;
bool use_weight; bool use_weight;
float sel_col[3];
float nosel_col[3];
} CacheEditrPathsIterData; } CacheEditrPathsIterData;
static void psys_cache_edit_paths_iter(void *__restrict iter_data_v, 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.segments = segments;
iter_data.use_weight = use_weight; 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; TaskParallelSettings settings;
BLI_parallel_range_settings_defaults(&settings); BLI_parallel_range_settings_defaults(&settings);
settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC; settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC;

9
source/blender/editors/physics/particle_edit.c
View File

@@ -5188,15 +5188,6 @@ void PE_create_particle_edit(
psys = NULL; 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); recalc_lengths(edit);
if (psys && !cache) { if (psys && !cache) {
recalc_emitter_field(depsgraph, ob, psys); recalc_emitter_field(depsgraph, ob, psys);

4
source/blender/editors/physics/particle_object.c
View File

@@ -1037,10 +1037,6 @@ static void copy_particle_edit(Depsgraph *depsgraph,
} }
update_world_cos(ob, edit); 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_lengths(edit);
recalc_emitter_field(depsgraph, ob, psys); recalc_emitter_field(depsgraph, ob, psys);
PE_update_object(depsgraph, scene, ob, true); PE_update_object(depsgraph, scene, ob, true);