Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:17:35 +0000 (10:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:17:35 +0000 (10:17 +1000)
1  2 
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/physics/particle_edit.c

index 40a7c65385c0e8522b9612afb3b11bede02ef79e,ad4c377879d7a5148c96610f29130027aa993f82..cb781dc24478db24a28b4712c8857f7edd1673b0
@@@ -1356,21 -1155,21 +1358,23 @@@ static void PE_update_selection(Depsgra
                                hkey++;
                        }
                }
+       }
  
 -      psys_cache_edit_paths(scene, ob, edit, CFRA, G.is_rendering);
 +      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);
  }
  
 -void update_world_cos(Object *ob, PTCacheEdit *edit)
 +void update_world_cos(Depsgraph *UNUSED(depsgraph), Object *ob, PTCacheEdit *edit)
  {
        ParticleSystem *psys = edit->psys;
 -      ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
 +      ParticleSystemModifierData *psmd_eval = edit->psmd_eval;
        POINT_P; KEY_K;
        float hairmat[4][4];