diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 03:17:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 03:17:35 +0300 |
| commit | 3036a9a46c18758bfae90163e14e3b5d38c2680a (patch) | |
| tree | eba0bfccd53d7526b685019cdd4a1c84df93c011 /source/blender/editors/physics | |
| parent | 5e8dbafb5b211f9a2c7de5580a7e83254706521b (diff) | |
| parent | c29c426925311eeb79e3988609e914e72b61013b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 40a7c65385c..cb781dc2447 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1344,25 +1344,29 @@ static void PE_update_selection(Depsgraph *depsgraph, Scene *scene, Object *ob, /* flag all particles to be updated if not using flag */ if (!useflag) - LOOP_POINTS - point->flag |= PEP_EDIT_RECALC; + LOOP_POINTS { + point->flag |= PEP_EDIT_RECALC; + } /* flush edit key flag to hair key flag to preserve selection * on save */ - if (edit->psys) LOOP_POINTS { + if (edit->psys) { + LOOP_POINTS { hkey = edit->psys->particles[p].hair; LOOP_KEYS { hkey->editflag = key->flag; hkey++; } } + } psys_cache_edit_paths(depsgraph, scene, ob, edit, CFRA, G.is_rendering); /* disable update flag */ - LOOP_POINTS + LOOP_POINTS { point->flag &= ~PEP_EDIT_RECALC; + } DEG_id_tag_update(&ob->id, DEG_TAG_SELECT_UPDATE); } @@ -2097,8 +2101,9 @@ static int hide_exec(bContext *C, wmOperator *op) point->flag |= PEP_HIDE; point->flag |= PEP_EDIT_RECALC; - LOOP_KEYS - key->flag &= ~PEK_SELECT; + LOOP_KEYS { + key->flag &= ~PEK_SELECT; + } } } else { @@ -2106,8 +2111,9 @@ static int hide_exec(bContext *C, wmOperator *op) point->flag |= PEP_HIDE; point->flag |= PEP_EDIT_RECALC; - LOOP_KEYS - key->flag &= ~PEK_SELECT; + LOOP_KEYS { + key->flag &= ~PEK_SELECT; + } } } |