[Bf-blender-cvs] [3036a9a46c1] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 3036a9a46c18758bfae90163e14e3b5d38c2680a
Author: Campbell Barton
Date:   Tue Aug 14 10:17:35 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB3036a9a46c18758bfae90163e14e3b5d38c2680a

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/physics/particle_edit.c
index 40a7c65385c,ad4c377879d..cb781dc2447
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@@ -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];