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

[Campbell Barton]

Commit: a60727080f136bbbc3628bcd54d4d78fc95b6a4e
Author: Campbell Barton
Date:   Sat Aug 12 14:06:02 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBa60727080f136bbbc3628bcd54d4d78fc95b6a4e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/dynamicpaint.c
index 6ac284d6b73,ae896176b6d..45c3e92b70b
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@@ -2062,11 -2060,8 +2062,8 @@@ DerivedMesh *dynamicPaint_Modifier_do(D
  	if (pmd->canvas) {
  		DerivedMesh *ret;
  
- 		/* For now generate looptris in every case */
- 		DM_ensure_looptri(dm);
- 
  		/* Update canvas data for a new frame */
 -		dynamicPaint_frameUpdate(pmd, scene, ob, dm);
 +		dynamicPaint_frameUpdate(pmd, eval_ctx, scene, ob, dm);
  
  		/* Return output mesh */
  		ret = dynamicPaint_Modifier_apply(pmd, ob, dm);
@@@ -2074,11 -2069,8 +2071,8 @@@
  		return ret;
  	}
  	else {
- 		/* For now generate looptris in every case */
- 		DM_ensure_looptri(dm);
- 
  		/* Update canvas data for a new frame */
 -		dynamicPaint_frameUpdate(pmd, scene, ob, dm);
 +		dynamicPaint_frameUpdate(pmd, eval_ctx, scene, ob, dm);
  
  		/* Return output mesh */
  		return dynamicPaint_Modifier_apply(pmd, ob, dm);
diff --cc source/blender/blenkernel/intern/fluidsim.c
index 5599190010d,8e98a9f672d..96637fa5458
--- a/source/blender/blenkernel/intern/fluidsim.c
+++ b/source/blender/blenkernel/intern/fluidsim.c
@@@ -78,10 -78,8 +78,8 @@@ void initElbeemMesh(struct EvaluationCo
  	float *verts;
  	int *tris;
  
 -	dm = mesh_create_derived_index_render(scene, ob, CD_MASK_BAREMESH, modifierIndex);
 +	dm = mesh_create_derived_index_render(eval_ctx, scene, ob, CD_MASK_BAREMESH, modifierIndex);
  
- 	DM_ensure_looptri(dm);
- 
  	mvert = dm->getVertArray(dm);
  	mloop = dm->getLoopArray(dm);
  	looptri = dm->getLoopTriArray(dm);