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

Fix T40756 Select Linked by Particle System matches ignores selected

Browse Source 
psys.

This is inconsistent with other comparable cases like materials, where
the active slot is used to define matching objects.
This commit is contained in:
Lukas Tönne
2014-06-23 08:20:35 +02:00
parent 77f357728f
commit 95d6c01478
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/object/object_select.c
View File

@@ -315,22 +315,20 @@ static bool object_select_all_by_dup_group(bContext *C, Object *ob)
static bool object_select_all_by_particle(bContext *C, Object *ob)
{
ParticleSystem *psys_act = psys_get_current(ob);
bool changed = false;
CTX_DATA_BEGIN (C, Base *, base, visible_bases)
{
if ((base->flag & SELECT) == 0) {
/* loop through other, then actives particles*/
/* loop through other particles*/
ParticleSystem *psys;
ParticleSystem *psys_act;
for (psys = base->object->particlesystem.first; psys; psys = psys->next) {
for (psys_act = ob->particlesystem.first; psys_act; psys_act = psys_act->next) {
if (psys->part == psys_act->part) {
base->flag |= SELECT;
changed = true;
break;
}
if (psys->part == psys_act->part) {
base->flag |= SELECT;
changed = true;
break;
}
if (base->flag & SELECT) {