Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/physics/particle_edit.c
| Show First 20 Lines • Show All 331 Lines • ▼ Show 20 Lines | else if (pset->edittype == PE_TYPE_CLOTH && pid->type == PTCACHE_TYPE_CLOTH) { | ||||
| // NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB; | // NICE TO HAVE but doesn't work: pset->brushtype = PE_BRUSH_COMB; | ||||
| PE_create_particle_edit(depsgraph, scene, ob, pid->cache, NULL); | PE_create_particle_edit(depsgraph, scene, ob, pid->cache, NULL); | ||||
| } | } | ||||
| edit = pid->cache->edit; | edit = pid->cache->edit; | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| if (edit) { | /* Don't consider inactive or render dependency graphs, since they might be evaluated for a | ||||
| * different number of childrem. or have different pointer to evaluated particle system or | |||||
brecht: evaluared -> evaluated | |||||
| * modifier which will also cause troubles. */ | |||||
| if (edit && DEG_is_active(depsgraph)) { | |||||
| edit->pid = *pid; | edit->pid = *pid; | ||||
| if (edit->flags & PT_CACHE_EDIT_UPDATE_PARTICLE_FROM_EVAL) { | if (edit->flags & PT_CACHE_EDIT_UPDATE_PARTICLE_FROM_EVAL) { | ||||
| if (edit->psys != NULL) { | if (edit->psys != NULL && edit->psys_eval != NULL) { | ||||
| psys_copy_particles(edit->psys, edit->psys_eval); | psys_copy_particles(edit->psys, edit->psys_eval); | ||||
| pe_update_hair_particle_edit_pointers(edit); | pe_update_hair_particle_edit_pointers(edit); | ||||
| } | } | ||||
| edit->flags &= ~PT_CACHE_EDIT_UPDATE_PARTICLE_FROM_EVAL; | edit->flags &= ~PT_CACHE_EDIT_UPDATE_PARTICLE_FROM_EVAL; | ||||
| } | } | ||||
| } | } | ||||
| BLI_freelistN(&pidlist); | BLI_freelistN(&pidlist); | ||||
| ▲ Show 20 Lines • Show All 5,180 Lines • Show Last 20 Lines | |||||
evaluared -> evaluated